On 9/29/06, Witold Rugowski <rugowski@nhw.pl> wrote:
> Hi!
> I have trouble with one thing in svn. I often want to "go back" a few
> revisions of particular file. But when I do
>
> rm FILE
> svn update -r SomeOldRevison FILE
>
> after making changes to FILE commit fails with something like
> svn: Out of date: 'FILE' in transaction 'SomeNewRevision'
>
> I looked through SVN book, read FAQ and history but find no easy
> solution. Currently I do :
>
> rm FILE
> svn update -r SomeOldRevison FILE
> cat FILE > /tmp/FILE
> svn update FILE
> cat /tmp/FILE > FILE
> rm /tmp/FILE
>
>
> Is there some other, less cumbersome way to do this?
You need a reverse merge. svn merge -r <laterrev>:<oldrev> file
http://svnbook.red-bean.com/nightly/en/svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.undo
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 29 12:34:27 2006