On Jan 17, 2008, at 20:57, B. Bogart wrote:
> 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.
You can't[1] throw away 227 and make a new 227. 227 is part of the
repository's permanent history, as is every other committed revision.
You can just commit a new 228 (or whatever the current HEAD+1
revision is) which undoes the changes of 227. This is explained in
the book:
http://svnbook.red-bean.com/en/1.4/
svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.undo
[1] Ok, so you can delete a revision, but it's an admin task, and
it's not the proper way to use Subversion on a day-to-day basis so
I'm not going to discuss it here.
---------------------------------------------------------------------
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 05:23:37 CET