使用 svnmerge.py 工具进行 Subversion 合并 [英] Subversion Merge using svnmerge.py tool
问题描述
任何机构都可以让我知道如何在分支上使用 svnmerge.py,我用谷歌搜索了很多但效果不佳,有些地方我做错了,
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,
我有一个名为 http://svnrepository/mitrac/bldtest1 和 bldtest2 的分支,我需要合并从 bldtest1 到 bldtest2 的一些修订并阻止了一些修订,请让我知道一步一步的过程,如果你给我一步一步的方法,我真的很感激.
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.
谢谢普拉文
推荐答案
bldtest2分支下issue this
under bldtest2 branch issue this
$ svnmerge.py init http://svnrepository/mitrac/bldtest1
一旦您初始化了分支以从存储库中获取更新,您就可以发出诸如 svnmerge.pyavail 之类的命令来查看要应用的任何传入修订...您可以在 svnmerge.py wiki.
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.
这篇关于使用 svnmerge.py 工具进行 Subversion 合并的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!