I have a revision that has been committed to SVN trunk which I would like to roll back. However, I would like to retain the changes in some fashion such as a branch or even a patch file. Any suggestions?
+8
A:
Reverse-merge (I think that was the term), commit and that's all.
For the "reverse-merge" part - TSVN has this cool feature called "Revert to this revision" (and "Revert changes from this revision"), accessible through the Log dialogue.
The main purpose of a VCS is to keep history of your changes. You could always go back to this particular revision by using "Update to revision..." or by using the aforementioned "shortcuts".
Milen A. Radev
2008-10-19 23:58:59
And would I reinstate the changes at a later date?
Oleg Barshay
2008-10-20 00:00:03
You can restore the changes by reverting the previous revert.
Greg Hewgill
2008-10-20 00:04:07
Makes sense, thank you.
Oleg Barshay
2008-10-20 00:05:21
This just saved my life :-)
cagcowboy
2009-02-13 11:14:16
Odd - I don't see the "Revert to this revision" option. Is there a security setting that could hide this option from me?
Mike C.
2009-07-15 21:18:02
@myself, I was going in through the Repo Browser, which is why the option was not available.
Mike C.
2009-07-16 15:22:25
+1
A:
You can specify a particular revision when you do a copy (ie. branch).
Something like:
svn copy -rsome_revision trunk branches/interesting_branch
So roll back your changes in your trunk and then do your branch, specifying the revision before you commited your rollback (merge).
You can also capture the differences as a patch file, if that's what you really want to do, by redirecting the output of an svn diff to a text file.
But that's usually not necessary, as the subversion merge commands give you this flexibility already.
Andrew Edgecombe
2008-10-20 00:04:48