Reputation: 2656
I've accidentally checked-in a file to SVN.
I'd like to undo this.
I know I can svn merge -r COMMITTED:PREV
. and then check-in my working copy.
But now I've lost the work I've done locally.
Is there a better way?
Upvotes: 3
Views: 588
Reputation: 97282
If you have modified Working Copy, you can (except noted recipes)
svn diff
), restore pristine WC (svn revert
), reverse-merge, apply patch backUpvotes: 1
Reputation: 28174
Check out another working copy & perform your reverse merge there. Or copy your changes elsewhere, perform the merge, then copy your changes back.
Upvotes: 2