You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Mark Phippard <ma...@gmail.com> on 2007/05/23 00:16:04 UTC
[RFC] - New option to resolve conflicts on merge/resolved commands
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.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [RFC] - New option to resolve conflicts on merge/resolved commands
Posted by "C. Michael Pilato" <cm...@collab.net>.
Mark Phippard 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.
Oh, I'm *so* +1 all over that.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: [RFC] - New option to resolve conflicts on merge/resolved commands
Posted by Mark Phippard <ma...@gmail.com>.
On 5/23/07, Eric Gillespie <ep...@pretzelnet.org> wrote:
> "Jared Hardy" <ja...@gmail.com> writes:
>
> > 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
>
> Well, i don't know about those other two options, but i've always
> wanted this --accept option on all commands that might merge
> (checkout/update/switch/merge i think?).
OK, entered issue.
http://subversion.tigris.org/issues/show_bug.cgi?id=2784
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [RFC] - New option to resolve conflicts on merge/resolved commands
Posted by Eric Gillespie <ep...@pretzelnet.org>.
"Jared Hardy" <ja...@gmail.com> writes:
> 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
Well, i don't know about those other two options, but i've always
wanted this --accept option on all commands that might merge
(checkout/update/switch/merge i think?).
--
Eric Gillespie <*> epg@pretzelnet.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [RFC] - New option to resolve conflicts on merge/resolved commands
Posted by Jared Hardy <ja...@gmail.com>.
On 5/22/07, Mark Phippard <ma...@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