Undo reverse merge in Subversion, or double-reverse merge

▼魔方 西西 提交于 2019-12-02 07:30:34

问题


What is the best way to undo a committed reverse merge?

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:

  1. Reverse merge revision 101
  2. Merge revision 100
  3. Copy the changes made in 100 to my working copy without mergeinfo

Any suggestions?


回答1:


Reverse merging revision 101 describes best what you're doing, ie undoing the undo.



来源:https://stackoverflow.com/questions/4628971/undo-reverse-merge-in-subversion-or-double-reverse-merge

易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!