Re: svn commit: r996383 - in /subversion/trunk/subversion: svn/conflict-callbacks.c tests/cmdline/resolve_tests.py

[Stefan Sperling <st...@elego.de>]

On Sun, Sep 12, 2010 at 08:23:30PM -0000, danielsh@apache.org wrote:
> Author: danielsh
> Date: Sun Sep 12 20:23:30 2010
> New Revision: 996383
> 
> URL: http://svn.apache.org/viewvc?rev=996383&view=rev
> Log:
> 'svn --accept': add shorthands.
> 
> * subversion/tests/cmdline/resolve_tests.py
>   (automatic_conflict_resolution):  Adjust a test to cover the shorthand.
> 
> * subversion/svn/conflict-callbacks.c
>   (svn_cl__accept_from_word): Recognize the abbreviations from...
>   (svn_cl__conflict_handler): ...the interactive prompt, and add cross-references.
> 
> Modified:
>     subversion/trunk/subversion/svn/conflict-callbacks.c
>     subversion/trunk/subversion/tests/cmdline/resolve_tests.py
> 
> Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=996383&r1=996382&r2=996383&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
> +++ subversion/trunk/subversion/svn/conflict-callbacks.c Sun Sep 12 20:23:30 2010
> @@ -59,23 +59,33 @@ svn_cl__conflict_baton_make(svn_cl__acce
>  svn_cl__accept_t
>  svn_cl__accept_from_word(const char *word)
>  {
> -  if (strcmp(word, SVN_CL__ACCEPT_POSTPONE) == 0)
> +  /* Shorthand options are consistent with  svn_cl__conflict_handler(). */
> +  if (strcmp(word, SVN_CL__ACCEPT_POSTPONE) == 0
> +      || strcmp(word, "p") == 0)

Even though these strings are really short, could we add file-local macros
for them since we now require them to be consistent across two places?