Subversion Merge using svnmerge.py tool

问题

Can any body let me know how to use svnmerge.py on branches, I googled out many but did not work well,some where I am doing wrong,

I have a branch called http://svnrepository/mitrac/bldtest1 and bldtest2 branches, I need to merge some revisions from bldtest1 to bldtest2 and block some revisions,Please let me know step by step procedure,I really appreciate if you give me a step by step approach.

Thanks Pravin

回答1:

svnmerge.py was used for pre 1.5 versions of subversion in order to achieve 'merge tracking'. For version 1.5 and later 'merge tracking' is built into subversion.

svn checkout http://svnrepository/mitrac/bldtest1
cd bldtest1
svn merge -r45:50 http://svnrepository/mitrac/bldtest2
svn merge -r53:55 http://svnrepository/mitrac/bldtest2
svn ci -m"Revision 45:50 and 53:55 merged" 

Using this approach you just merge 'desired' revision.

Use svn revert to undo unwanted changes.

回答2:

under bldtest2 branch issue this

$ svnmerge.py init http://svnrepository/mitrac/bldtest1

Once you have initialized the branch to fetch the updates from the repository you can then issue commands like svnmerge.py avail to see any incoming revisions to be applied... You can find most of them at the svnmerge.py wiki.

来源：https://stackoverflow.com/questions/4127427/subversion-merge-using-svnmerge-py-tool