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

Re: Interactively postpone all remaining conflicts?

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2007-11-07 01:14:55 CET

Ben Collins-Sussman wrote:
> Perforce has this, in fact. Something like "at" means "for the rest
> of the operation, select ALL (t)heirs". There's a similar "am"
> response, and maybe we could also do something like "ap".

Actually, FWIW, Perforce's "at", "am" etc. mean "accept Theirs", "Accept
Merged" etc. Their help text doesn't indicate there's an interactive way of
saying "accept all the rest as ..."; you have to stop and then run the
"resolve" subcommand with the appropriate command-line option like "-at".
Likewise, a Subversion user could/would break and re-run the merge/update
command with "--accept=theirs" or whatever, if we don't provide an interactive
"all the rest" command. (Assuming that break-and-re-start works safely...?)

(I'm not implying any opinion on the desirability of "all the rest" commands.)

- Julian

> On Nov 6, 2007 12:28 AM, Karl Fogel <kfogel@red-bean.com> wrote:
>
>>I recently did a massive merge, and by about the 10th conflict prompt...
>>
>> Conflict discovered in 'subversion/libsvn_ra_local/ra_plugin.c'.
>> Select: (p)ostpone, (d)iff, (e)dit, (h)elp for more options : h
>> (p)ostpone - mark the conflict to be resolved later
>> (d)iff - show all changes made to merged file
>> (e)dit - change merged file in an editor
>> (r)esolved - accept merged version of file
>> (m)ine - accept my version of file
>> (t)heirs - accept their version of file
>> (l)aunch - use third-party tool to resolve conflict
>> (h)elp - show this list
>>
>>...I really wanted an option for "postpone all". (For that matter,
>>there might be circumstances where "resolve all", "use mine for all",
>>etc might be useful, but probably "postpone all" would be the common
>>case. If we want to generalize it, then maybe "*", as in "LETTER*",
>>could be the trick for the command-line client.)
>>
>>Thoughts? I have no idea if this would be easy or hard to implement,
>>I first wanted to get a sense of whether we like it.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Nov 7 01:15:14 2007

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