Subversion - How do I commit? I updated one of my project directories to a previous revision

Question

First, I used "update to revision" to update one of my directories to an old revision because we had to undo some changes.

However, when I go to commit now, It is stating that items of my project are out of date and that I should try updating.

However, I really don't want my current files to be replaced by any "newer" files in the revision.

I would like this commit to jump ahead and be the head revision.

Any tips?

Thanks

Answer 1

What you want to do is called a "reverse merge". Update your working copy to head, then perform a reverse merge to the revision you desire. There is a section in the SVN book about it here, under the "Undoing Changes" section.

For example, if you are at revision 412, but you want to back up to the contents of revision 410, use something like the following:

svn merge -r 412:410 http://yourrepository/trunk

This will get your working copy to reflect the state at 410, and then you can do a commit.