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

Re: How can I ignoring a commit and moving past it?

From: Max Bowsher <maxb_at_ukf.net>
Date: 2005-02-26 13:36:25 CET

Michael Abbott wrote:
> Max Bowsher wrote:
>>>> Another developer has just committed 76 and 77, both of which I just
>>>> want to
>>>> throwaway. They contain problem code that's way easier to just
>>>> ignore (and
>>>> start over) than to try and merge.
>>> Since you've currently got a working copy, I'd do this:
>>> * Make a copy of the file
>>> * Revert it
>>> * Update it to version 77
>>> * Copy the other file back in it's place.
>> Alternatively,
>> http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.2
> But doesn't that mean that you have to apply the other developer's
> changes (including merging any conflicts) and then un-apply them again
> via a reverse merge?

So, do the reverse merge in a different working copy to the one you have
pending changes in.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Feb 26 14:09:34 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.