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

Re: svn commit: r25688 - trunk/subversion/svn

From: David Glasser <glasser_at_mit.edu>
Date: 2007-07-09 05:22:06 CEST

On 7/8/07, sussman@tigris.org <sussman@tigris.org> wrote:
> Log:
> Small tweaks to interactive conflict UI, based on list discussion.
>
> * subversion/svn/conflict-callbacks.c
> (svn_cl__interactive_conflict_handler): change (a)ccept to (r)esolved.
> tweak help wording.
> add '?' as synonym for (h)elp.

In the log message you say "resolved"...

>
> Modified:
> trunk/subversion/svn/conflict-callbacks.c
>
> Modified: trunk/subversion/svn/conflict-callbacks.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/conflict-callbacks.c?pathrev=25688&r1=25687&r2=25688
> ==============================================================================
> --- trunk/subversion/svn/conflict-callbacks.c (original)
> +++ trunk/subversion/svn/conflict-callbacks.c Sun Jul 8 19:32:48 2007
> @@ -167,20 +167,20 @@
> prompt = apr_pstrcat(subpool, prompt, _(", (d)iff, (e)dit"),
> NULL);
> if (performed_edit)
> - prompt = apr_pstrcat(subpool, prompt, _(", (a)ccept"), NULL);
> + prompt = apr_pstrcat(subpool, prompt, _(", (r)esolve"), NULL);

but here...

> prompt = apr_pstrcat(subpool, prompt, _(", (h)elp : "), NULL);
>
> SVN_ERR(svn_cmdline_prompt_user(&answer, prompt, subpool));
>
> - if (strcmp(answer, "h") == 0)
> + if ((strcmp(answer, "h") == 0) || (strcmp(answer, "?") == 0))
> {
> SVN_ERR(svn_cmdline_printf(subpool,
> _(" (p)ostpone - mark the conflict to be resolved later\n"
> " (d)iff - show all changes made to merged file\n"
> - " (e)dit - use an editor to resolve conflict\n"
> - " (a)ccept - use merged verison of file\n"
> - " (m)ine - use my version of file\n"
> - " (t)heirs - use repository's version of file\n"
> + " (e)dit - change merged file in an editor\n"
> + " (r)esolve - accept merged version of file\n"

... and here you say "resolve", with no d. (I prefer with the d
myself, for consistency with the subcommand, and because "resolve" can
be interpreted as "resolve using a tool" or something.)

--dave

-- 
David Glasser | glasser_at_mit.edu | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 9 05:21:53 2007

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