Changes between Version 4 and Version 5 of how-to/roundcube-upgrade

Timestamp:

Apr 8, 2013, 5:30:02 AM (12 years ago)

Author:

Daniel Kahn Gillmor

Comment:

--

how-to/roundcube-upgrade

@@ -66 +66 @@
 0 jamie@animal:roundcube$
 }}}
- * If you are doing a major point upgrade (e.g. from 0.8.x to 0.9.x):
-  * Merge. 
-{{{
-git merge origin/0.9.0
+
+We're leaning toward rebasing as a matter of common practice, and leaving a trail of signed tags:
+
+ * start by rebasing, inspecting, verifying, signing a tag, and then pushing to `git.mayfirst.org`:
+   {{{
+git rebase 0.8.6
+# examine the changelog and the git history; make sure things look sane.
+git tag -s -m 'Tagging roundcube with MF/PL changes version 0.8.6' roundcube-mfpl-0.8.6
+git push gmo --tags
 }}}
-  * Then push to gmo
-{{{
-git push gmo
-}}}
- * If you are doing a minor point upgrade (e.g. from 0.9.1 to 0.9.2):
-  * rebase:
-{{{
-git rebase origin/0.9.2
-}}}
-  * Push with the -f option to force a non-fast forward merge:
-{{{
-git push -f gmo
-}}}
- * Now tag
-{{{
-git tag mfpl-0.9.0
-}}}
- * Now, test in /srv/roundcube-dev/
-{{{
-git checkout gmo mfpl-0.9.0
+ * Now, as `roundcube-code@stallman.mayfirst.org`, verify the tag and check it out if it looks reasonable:
+   {{{
+cd /srv/roundcube-dev
+git remote update
+git tag -v roundcube-mfpl-0.8.6
+git checkout roundcube-mfpl-0.8.6
 }}}
  * Test via: https://roundcube.dev.mayfirst.org/
- * If all works fine, pull into the live server by running, in /srv/roundcube:
-{{{
-git checkout gmo mfpl-0.9.0
+ * If all works fine, pull into the live server via `roundcube-code@stallman.mayfirst.org:
+   {{{
+cd /srv/roundcube
+git remote update
+git tag -v roundcube-mfpl-0.8.6
+git checkout roundcube-mfpl-0.8.6
 }}}
+ * and test it one last time at https://roundcube.mayfirst.org/