Changes between Version 2 and Version 3 of how-to/roundcube-upgrade

Timestamp:

Mar 11, 2013, 12:17:00 AM (11 years ago)

Author:

Jamie McClelland

Comment:

--

how-to/roundcube-upgrade

@@ -17 +17 @@
 Initialized empty Git repository in /home/jamie/projects/mfpl/roundcube/.git/
 0 jamie@animal:roundcube$ git remote add origin https://github.com/roundcube/roundcubemail
-0 jamie@animal:roundcube$ git remote add mfpl gitosis@git.mayfirst.org:mfpl/roundcube
-0 jamie@animal:roundcube$ git remote add mfpl-live roundcube-code@stallman.mayfirst.org:/srv/roundcube
-0 jamie@animal:roundcube$ git remote add mfpl-dev roundcube-code@stallman.mayfirst.org:/srv/roundcube-dev
+0 jamie@animal:roundcube$ git remote add gmo gitosis@git.mayfirst.org:mfpl/roundcube
 0 jamie@animal:roundcube$ git remote update
 Fetching origin
@@ -51 +49 @@
  * [new tag]         v0.9-beta  -> v0.9-beta
  * [new tag]         v0.9-rc    -> v0.9-rc
-Fetching mfpl
+Fetching gmo 
 remote: Counting objects: 4182, done.
 remote: Compressing objects: 100% (1135/1135), done.
@@ -60 +58 @@
  * [new branch]      master     -> mfpl/master
  * [new branch]      mfpl       -> mfpl/mfpl
-Fetching mfpl-live
-remote: Counting objects: 47, done.
-remote: Compressing objects: 100% (26/26), done.
-remote: Total 26 (delta 15), reused 0 (delta 0)
-Unpacking objects: 100% (26/26), done.
-From stallman.mayfirst.org:/srv/roundcube
- * [new branch]      master     -> mfpl-live/master
- * [new branch]      mfpl       -> mfpl-live/mfpl
- * [new branch]      release-0.7 -> mfpl-live/release-0.7
- * [new branch]      release-0.8 -> mfpl-live/release-0.8
-Fetching mfpl-dev
-remote: Counting objects: 28, done.
-remote: Compressing objects: 100% (20/20), done.
-remote: Total 20 (delta 11), reused 0 (delta 0)
-Unpacking objects: 100% (20/20), done.
-From stallman.mayfirst.org:/srv/roundcube-dev
- * [new branch]      master     -> mfpl-dev/master
- * [new branch]      mfpl       -> mfpl-dev/mfpl
- * [new branch]      release-0.7 -> mfpl-dev/release-0.7
- * [new branch]      release-0.8 -> mfpl-dev/release-0.8
 0 jamie@animal:roundcube$
 }}}
- * Now, checkout (and create a branch) for the mfpl branch of the mfpl remote (yes, confusing to have the same name for both).
+ * Now, checkout (and create a branch) for the mfpl branch of the gmo remote.
 {{{
-0 jamie@animal:roundcube$ git checkout -b mfpl mfpl/mfpl
-Branch mfpl set up to track remote branch mfpl from mfpl.
+0 jamie@animal:roundcube$ git checkout -b mfpl gmo/mfpl
+Branch mfpl set up to track remote branch mfpl from gmo.
 Switched to a new branch 'mfpl'
 0 jamie@animal:roundcube$
 }}}
- * If you run `git log` you'll see several commits made by MF/PL support team members. We want to keep these commits on top, so next we will rebase the tag we want to upgrade to:
+ * If you are doing a major point upgrade (e.g. from 0.8.x to 0.9.x):
+  * Merge. 
 {{{
-0 stallman:/srv/roundcube#  git rebase origin/release-0.8
-First, rewinding head to replay your work on top of it...
-Applying: Reducing the min-width. Addresses https://support.mayfirst.org/ticket/6599. Upstream commit id e8b9176031926532a764582812047281e4401352.
-Applying: Adding two plugins: import_horde_contacts, import_horde_identities
-Applying: (fetch_identity_objects): avoid redundant call to unserialize
-0 stallman:/srv/roundcube#
+git merge origin/0.9.0
 }}}
- * Now merge with the mfpl branch of the mfpl remote and then push:
+  * Then push to gmo
 {{{
-git merge mfpl/mfpl
-git push mfpl mfpl
+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 pull mfpl mfpl
+git checkout gmo mfpl-0.9.0
 }}}
  * Test via: https://roundcube.dev.mayfirst.org/
  * If all works fine, pull into the live server by running, in /srv/roundcube:
 {{{
-git pull mpl mfpl
+git checkout gmo mfpl-0.9.0
 }}}