Menu
So say I have the three latest revisions of an aspx file: 55, 56 and 57. Revision 56 added a feature that I want to remove, but I also want to have the new features deployed in version 57. Is there any way I can merge version 55 with 57, leaving revision 56 out of the picture?
If it matters, I'm using Tortoise SVN and Visual SVN, but I normally just use Tortoise.
Thanks for any ideas.
204
Right click on the selected revision, then select Context Menu → Revert to this revision. This will discard all changes after the selected revision. Make a commit.
Reverts any local changes to a file or directory and resolves any conflicted states. svn revert will revert not only the contents of an item in your working copy, but also any property changes.
Note that the svn merge command reverts a commit in the sense of having another commit undoing your changes, but keeping your wrong commit in the history.
If I'm following your question, it sounds like you want r57 minus r56. (i.e. including changes from r55 to r0)
command-line:
svn merge <path_to_repo> . -c -56
Tortoise:
Show Log / Right-click revision 56 and select "Revert changes from this revision"
140
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
