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

Re: Tree conflicts - high-priority User Interface tasks

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Mon, 20 Oct 2008 16:27:02 -0400

Julian Foad wrote:
> On Mon, 2008-10-20 at 14:54 +0200, Stefan Sperling wrote:
>> On Sat, Oct 18, 2008 at 02:00:39PM +0100, Julian Foad wrote:
>>> * There must be a way to use "svn merge" to merge a required change
>>> into a WC to resolve a tree conflict. (The merge currently fails if
>>> there is any conflict already flagged, which is usually the desired
>>> behaviour, but not when you're trying to resolve a conflict and need to
>>> use a merge.)
>> What about making a merge into a tree conflict victim conditional
>> on the popular --force switch?
> Yeah, maybe that really is a valid use of "--force". It looks like a
> reasonable solution to the problem.
> (I hereby swear that this really is me saying this. :-) )

Haha. I'm going to need you to resent your mail, PGP-signed by yourself,
before I buy this. ;-)

C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2008-10-20 22:27:24 CEST

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