SVN: How to undo a reverse-merge?
I merged my checkout of the HEAD revision back to revision 1000:
$ svn merge -rHEAD:1000 .
--- Reverse-merging r2000 through r1001 into '.':
U dir/foo.txt
After that, I'd like to undo that and merge back to HEAD revision. My checkout should be at revision 1000 now, so I need to merge everything from 1000 to HEAD. But svn doesn't do anything:
$ svn mer开发者_如何转开发ge -r1000:HEAD .
Hmm, or just a revert?
$ svn revert .
It's just quiet and doesn't update foo.txt
to the HEAD revision. How should I do it?
Do it recursivly,
svn revert -R .
Or revert only that changed file
svn revert dir/foo.txt
精彩评论