在SVN中重新应用先前还原的提交 [英] Re-apply a previously reverted commit in SVN

问题描述

我修改了修订版本1.这导致构建失败，所以我恢复了修订版本2中的更改。同时，其他开发人员已经做了一些修改。

但现在我想将修订版本1中的更改​​重新应用到本地Eclipse工作区中，作为修复代码的起点。我可以这样做吗？

换句话说，我想在修订版1和头文件之间创建一个diff，并将这些更改应用到我的工作副本。

虚构SVN日志：

  r1提交功能X< ; ---我希望这个修订适用于我的工作副本。 
 r2还原功能X 
 ... 
 r9 Bugfix 
 r10错误修复
 r11错误修复
头
  / pre> 
 
解决方案
反向合并修订版本＃2撤销撤消您在那里所做的更改。
 
I committed a change in revision 1. This caused the build to fail, so I reverted the changes in revision 2. In the meantime, other developers have committed a few revisions.

But now I want to re-apply the changes from revision 1 into a local Eclipse workspace to use as the starting-point of fixing the code. How can I do that?

In other words, I want to create a diff between revision 1 and head and apply those changes to my working copy.

Imaginary SVN log:
r1 Commit feature X  <--- I want this revision applied to my working-copy.
r2 Revert feature X 
...
r9 Bugfix
r10 Bugfix
r11 Bugfix
Head

解决方案
Reverse-merge revision #2 to undo undoing the change you made there.

                        
这篇关于在SVN中重新应用先前还原的提交的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！