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


Ignore:
Timestamp:
Apr 8, 2013, 1:30:02 AM (6 years ago)
Author:
Daniel Kahn Gillmor
Comment:

--

Legend:

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

    v4 v5  
    66660 jamie@animal:roundcube$
    6767}}}
    68  * If you are doing a major point upgrade (e.g. from 0.8.x to 0.9.x):
    69   * Merge.
    70 {{{
    71 git merge origin/0.9.0
     68
     69We're leaning toward rebasing as a matter of common practice, and leaving a trail of signed tags:
     70
     71 * start by rebasing, inspecting, verifying, signing a tag, and then pushing to `git.mayfirst.org`:
     72   {{{
     73git rebase 0.8.6
     74# examine the changelog and the git history; make sure things look sane.
     75git tag -s -m 'Tagging roundcube with MF/PL changes version 0.8.6' roundcube-mfpl-0.8.6
     76git push gmo --tags
    7277}}}
    73   * Then push to gmo
    74 {{{
    75 git push gmo
    76 }}}
    77  * If you are doing a minor point upgrade (e.g. from 0.9.1 to 0.9.2):
    78   * rebase:
    79 {{{
    80 git rebase origin/0.9.2
    81 }}}
    82   * Push with the -f option to force a non-fast forward merge:
    83 {{{
    84 git push -f gmo
    85 }}}
    86  * Now tag
    87 {{{
    88 git tag mfpl-0.9.0
    89 }}}
    90  * Now, test in /srv/roundcube-dev/
    91 {{{
    92 git checkout gmo mfpl-0.9.0
     78 * Now, as `roundcube-code@stallman.mayfirst.org`, verify the tag and check it out if it looks reasonable:
     79   {{{
     80cd /srv/roundcube-dev
     81git remote update
     82git tag -v roundcube-mfpl-0.8.6
     83git checkout roundcube-mfpl-0.8.6
    9384}}}
    9485 * Test via: https://roundcube.dev.mayfirst.org/
    95  * If all works fine, pull into the live server by running, in /srv/roundcube:
    96 {{{
    97 git checkout gmo mfpl-0.9.0
     86 * If all works fine, pull into the live server via `roundcube-code@stallman.mayfirst.org:
     87   {{{
     88cd /srv/roundcube
     89git remote update
     90git tag -v roundcube-mfpl-0.8.6
     91git checkout roundcube-mfpl-0.8.6
    9892}}}
     93 * and test it one last time at https://roundcube.mayfirst.org/