Re: How to take back a revision from the trunk of a working copy?

Thanks Blair,

I did:

svn merge -c -227 .

svn info says I'm still at 226

svn commit tells me I have a file that "remains in conflict"

So I've svn resolved those files (since I want to keep whats in my
working copy)

svn commit again and!!!

back to "svn: Out of Date" but now it says the revision is "227-1" which
should be 226 right??

Feels a little cyclical now...

I really just want to throw away 227 and commit what is in my working
copy as 227.

Thanks.
B. Bogart

Blair Zajac wrote:
> Use a reverse merge to undo a commit:
>
> for 1.3 or older: svn merge -r N:N-1 . .
> for 1.4 or greater: svn merge -c -N . .
>
> svn commit -m 'Revert rN.'
>
> where N is the revision you want to undo.
>
> Regards,
> Blair
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-01-18 03:58:38 CET