[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Reverting out of a commit

From: Christopher Ness <chris_at_nesser.org>
Date: 2005-07-26 20:27:44 CEST

On Tue, 2005-07-26 at 10:55 -0700, Ron Gilbert wrote:
> > Perhaps the best way would be to place the non-corrupt binary file
> > into
> > your working copy and then commit your changes.
> > This will make a new HEAD revision with the updated file.
>
> This is what I was trying to do...I was doing this under TSVN and
> getting errors about my working copy not being uptodate.
>
> I just tried the same thing using the command line (Windows):
>
> # Get old, non-corrupt copy
> svn update -r99 foo.jpg

Now you cannot commit because your working copy is in a mixed revision
and out-of-date as far as subversion is concerned.

Was it luck that r99 was the file or are you following suit with my
revision numbers? Anyway, this should hopefully do it.
    svn up -rHEAD .

Where . is the directory foo.jpg lives in. Now overwrite the file using
the version in r99. Normally for source code you would do the reverse
merge, but in this case a binary merge is sketchy so simply dump the
file at that revision (`svn help cat` for more info).

    svn cat -r99 foo.jpg > foo.jpg # overwrite foo.jpg with r99
    svn -v status

Status should show only foo.jpg as modified and the first revision
numbers all at 100 (since you did an update to HEAD).

    svn commit

Now you should be able to commit without the error message below since
the working copy is up-to-date. SVN thinks you modified foo.jpg, and
you did, it just holds r99 data.

> If I modify foo.jpg, then I get a "Transaction failed, file out of
> date" (not exact words).

After all this I hope it works for you.

Cheers,
Chris

-- 
Wireless Group
McMaster University
summer
14:15:30 up 5 days, 8 min, 5 users, load average: 0.20, 0.17, 0.17
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jul 26 20:29:45 2005

This is an archived mail posted to the Subversion Users mailing list.