Code

Changes between Version 14 and Version 15 of MercurialBranches


Ignore:
Timestamp:
12/03/10 20:39:17 (4 years ago)
Author:
russellm
Comment:

Corrected copy-and-paste typo in merge script

Legend:

Unmodified
Added
Removed
Modified
  • MercurialBranches

    v14 v15  
    131131export SVNMERGE_REVISION=`hg svn info -r $1 | egrep '^Revision' | cut -f 2 -d ' '` 
    132132export DJANGO_BRANCH=`hg branch | cut -f 2 -d '/'` 
    133 hg transplant $1 --filter commit.py 
     133hg transplant $1 --filter /path/to/backport.py 
    134134unset SVNMERGE_REVISION 
    135135unset DJANGO_BRANCH