On Nov 6, 2007 6: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.)
[bikeshed]
Could I suggest that we use the uppercase equivalent as a means of
'all' for each of those commands? Like 'r' is "resolve file" and 'R'
would be "resolve all", etc.
Charles -- just dropping his 2 cents after rather scarce contribution of late.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Nov 8 13:55:13 2007