Subversion: How to merge only specific revisions into trunk when multiple consecutive changes are made in a branch?

前端 未结 8 1880
孤街浪徒
孤街浪徒 2020-12-09 10:34

I have been using TortoiseSVN, svn, and subclipse and I think I understand the basics, but there\'s one thing that\'s been bugging me for a while: Merging introduces unwante

8条回答
  •  予麋鹿
    予麋鹿 (楼主)
    2020-12-09 10:56

    Merging only revisions 4,7, and 11-15 with svnmerge:

    svnmerge.py merge -r4,7,11-15
    

    And with regular svn:

    svn merge -c4,7 -r10:15 http://.../branches/TRY-XX-Foo
    

提交回复
热议问题