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


Ignore:
Timestamp:
Mar 10, 2013, 8:17:00 PM (7 years ago)
Author:
Jamie McClelland
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • how-to/roundcube-upgrade

    v2 v3  
    1717Initialized empty Git repository in /home/jamie/projects/mfpl/roundcube/.git/
    18180 jamie@animal:roundcube$ git remote add origin https://github.com/roundcube/roundcubemail
    19 0 jamie@animal:roundcube$ git remote add mfpl gitosis@git.mayfirst.org:mfpl/roundcube
    20 0 jamie@animal:roundcube$ git remote add mfpl-live roundcube-code@stallman.mayfirst.org:/srv/roundcube
    21 0 jamie@animal:roundcube$ git remote add mfpl-dev roundcube-code@stallman.mayfirst.org:/srv/roundcube-dev
     190 jamie@animal:roundcube$ git remote add gmo gitosis@git.mayfirst.org:mfpl/roundcube
    22200 jamie@animal:roundcube$ git remote update
    2321Fetching origin
     
    5149 * [new tag]         v0.9-beta  -> v0.9-beta
    5250 * [new tag]         v0.9-rc    -> v0.9-rc
    53 Fetching mfpl
     51Fetching gmo
    5452remote: Counting objects: 4182, done.
    5553remote: Compressing objects: 100% (1135/1135), done.
     
    6058 * [new branch]      master     -> mfpl/master
    6159 * [new branch]      mfpl       -> mfpl/mfpl
    62 Fetching mfpl-live
    63 remote: Counting objects: 47, done.
    64 remote: Compressing objects: 100% (26/26), done.
    65 remote: Total 26 (delta 15), reused 0 (delta 0)
    66 Unpacking objects: 100% (26/26), done.
    67 From stallman.mayfirst.org:/srv/roundcube
    68  * [new branch]      master     -> mfpl-live/master
    69  * [new branch]      mfpl       -> mfpl-live/mfpl
    70  * [new branch]      release-0.7 -> mfpl-live/release-0.7
    71  * [new branch]      release-0.8 -> mfpl-live/release-0.8
    72 Fetching mfpl-dev
    73 remote: Counting objects: 28, done.
    74 remote: Compressing objects: 100% (20/20), done.
    75 remote: Total 20 (delta 11), reused 0 (delta 0)
    76 Unpacking objects: 100% (20/20), done.
    77 From stallman.mayfirst.org:/srv/roundcube-dev
    78  * [new branch]      master     -> mfpl-dev/master
    79  * [new branch]      mfpl       -> mfpl-dev/mfpl
    80  * [new branch]      release-0.7 -> mfpl-dev/release-0.7
    81  * [new branch]      release-0.8 -> mfpl-dev/release-0.8
    82600 jamie@animal:roundcube$
    8361}}}
    84  * Now, checkout (and create a branch) for the mfpl branch of the mfpl remote (yes, confusing to have the same name for both).
     62 * Now, checkout (and create a branch) for the mfpl branch of the gmo remote.
    8563{{{
    86 0 jamie@animal:roundcube$ git checkout -b mfpl mfpl/mfpl
    87 Branch mfpl set up to track remote branch mfpl from mfpl.
     640 jamie@animal:roundcube$ git checkout -b mfpl gmo/mfpl
     65Branch mfpl set up to track remote branch mfpl from gmo.
    8866Switched to a new branch 'mfpl'
    89670 jamie@animal:roundcube$
    9068}}}
    91  * 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:
     69 * If you are doing a major point upgrade (e.g. from 0.8.x to 0.9.x):
     70  * Merge.
    9271{{{
    93 0 stallman:/srv/roundcube#  git rebase origin/release-0.8
    94 First, rewinding head to replay your work on top of it...
    95 Applying: Reducing the min-width. Addresses https://support.mayfirst.org/ticket/6599. Upstream commit id e8b9176031926532a764582812047281e4401352.
    96 Applying: Adding two plugins: import_horde_contacts, import_horde_identities
    97 Applying: (fetch_identity_objects): avoid redundant call to unserialize
    98 0 stallman:/srv/roundcube#
     72git merge origin/0.9.0
    9973}}}
    100  * Now merge with the mfpl branch of the mfpl remote and then push:
     74  * Then push to gmo
    10175{{{
    102 git merge mfpl/mfpl
    103 git push mfpl mfpl
     76git push gmo
     77}}}
     78 * If you are doing a minor point upgrade (e.g. from 0.9.1 to 0.9.2):
     79  * rebase:
     80{{{
     81git rebase origin/0.9.2
     82}}}
     83  * Push with the -f option to force a non-fast forward merge:
     84{{{
     85git push -f gmo
     86}}}
     87 * Now tag
     88{{{
     89git tag mfpl-0.9.0
    10490}}}
    10591 * Now, test in /srv/roundcube-dev/
    10692{{{
    107 git pull mfpl mfpl
     93git checkout gmo mfpl-0.9.0
    10894}}}
    10995 * Test via: https://roundcube.dev.mayfirst.org/
    11096 * If all works fine, pull into the live server by running, in /srv/roundcube:
    11197{{{
    112 git pull mpl mfpl
     98git checkout gmo mfpl-0.9.0
    11399}}}