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

Re: [RFC] - New option to resolve conflicts on merge/resolved commands

From: Jared Hardy <jaredhardy_at_gmail.com>
Date: 2007-05-23 05:23:48 CEST

On 5/22/07, Mark Phippard <markphip@gmail.com> wrote:
> On IRC, dlr, epg and myself were discussing merge. Eric, mentioned
> that he wished we could do svn resolved --accept=mine | yours | orig.
> This would resolve the conflict by selecting the file specified in the
> option.
>
> He later went on to suggest that the same option could also be added
> to the merge command. This situation would most likely be used by
> automated merge scripts.
>
> I think this seems like a great idea, even if we only did it for
> resolved. I am just looking for some general +1's so I can file it as
> an issue in the tracker. Of course, if someone thinks this is a bad
> idea, then even more important to speak up.

I probably don't have voting rights, but that never stops me. A big +1 here.

    SVK gives a similar option on any update -- it interactively asks
you whether to use "mine", "theirs", "spawn default merge app now", or
"save revision-numbered file for merge later" (I'm paraphrasing of
course). I'm not suggesting constant interactive updates like this
(it's actually a little annoying), but I would like to be able to call
"svn up --mine-always ...", or something of the sort. There are many
occasions that I know what I want ahead of time, iff conflicts arise
upon update. These are the same occasions that I hate having to do 1
or more additional "resolve" steps.

:) Jred

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed May 23 05:23:58 2007

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