Code

Changes between Version 7 and Version 8 of MercurialBranches


Ignore:
Timestamp:
10/08/10 17:41:25 (4 years ago)
Author:
lukeplant
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • MercurialBranches

    v7 v8  
    11= Mercurial Branches = 
    22 
    3 This page documents how to use Mercurial, rather than Subversion, to hack on Django. 
     3This page documents how to use Mercurial, rather than Subversion, to hack on Django. See also DjangoBranches. 
    44 
    55== Core developers == 
     
    2525=== Tips === 
    2626 
    27  * Use the [http://mercurial.selenic.com/wiki/BookmarksExtension bookmarks] extension for git-style local feature branches. 
     27 * Use the [http://mercurial.selenic.com/wiki/BookmarksExtension bookmarks] extension for git-style local feature branches, or named branches for feature branches that you need other people to see. 
    2828 * Alternatively, use the [http://mercurial.selenic.com/wiki/MqExtension queues] extension to manage long lived patches. 
    2929 * To collapse several commits into a single commit before pushing back to svn, use the [http://mercurial.selenic.com/wiki/HisteditExtension histedit] extension 
     
    4444 
    4545SHORTBRANCH="$1" 
    46 BRANCH="releases/$SHORTBRANCH" 
     46BRANCH="releases/$SHORTBRANCH" # we only backport to release branches. 
    4747HGREV="$2" 
    4848 
     
    5858echo "Backporting Subversion revision $SVNREV" 
    5959hg update $BRANCH || exit 1; 
     60# Make a commit message first in case the transplant fails. 
     61hg log -r -1 --template "[$SHORTBRANCH] {desc}\n\nBackport of [$SVNREV] from trunk\n" > hg-commit-message.txt || exit 1 
    6062hg transplant $HGREV || exit 1; 
    6163# Modify the commit message 
    62 hg log -r -1 --template "[$SHORTBRANCH] {desc}\n\nBackport of [$SVNREV] from trunk\n" > hg-commit-message.txt || exit 1 
    6364hg rollback > /dev/null || exit 1 
    6465hg commit -l hg-commit-message.txt || exit 1 
     
    7071hg_backport 1.2.X 13643 
    7172}}} 
    72    where 1.2.X is a directory under 'releases/' in the Subversion repo, and 13643 is a hg revision ID.  The change is already committed, but not 'pushed', so you can still rollback if changes need to be made. 
     73   where 1.2.X is a directory under 'releases/' in the Subversion repo, and 13643 is a hg revision ID.  The change is already committed to the local repo, but not 'pushed', so you can still rollback if changes need to be made. 
    7374