在Subversion中撤消反向合并,或双反向合并 [英] Undo reverse merge in Subversion, or double-reverse merge
本文介绍了在Subversion中撤消反向合并,或双反向合并的处理方法,对大家解决问题具有一定的参考价值,需要的朋友们下面随着小编来一起学习吧!
问题描述
撤消已提交的反向合并的最佳方法是什么?
What is the best way to undo a committed reverse merge?
在这种情况下:我进行了一项更改,例如修订版100,导致了回归.由于我待了几天,没有时间调试问题,因此我将100反向合并并提交了修订版101.现在,我准备再次攻击该问题.为此,我有三个想法,但我不知道什么是最好的,甚至是什么将不起作用:
Here's the scenario: I committed a change, say revision 100, which caused a regression. Since I was leaving for a few days and didn't have time to debug the issue, I reverse-merged 100 and committed revision 101. Now I'm ready to attack the issue again. I have three ideas for doing this, but I don't know what is best or even what will work:
- 反向合并修订版101
- 合并修订版100
- 不使用mergeinfo将100中所做的更改复制到我的工作副本中
有什么建议吗?
推荐答案
反向合并修订版101最能说明您在做什么,即撤消撤消.
Reverse merging revision 101 describes best what you're doing, ie undoing the undo.
这篇关于在Subversion中撤消反向合并,或双反向合并的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!
查看全文