You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2017/08/23 09:36:15 UTC

svn commit: r1805871 - /subversion/trunk/subversion/svn/conflict-callbacks.c

Author: stsp
Date: Wed Aug 23 09:36:15 2017
New Revision: 1805871

URL: http://svn.apache.org/viewvc?rev=1805871&view=rev
Log:
* subversion/svn/conflict-callbacks.c
  (svn_cl__accept_from_word): Fix check for "r" (the shorthand form
   of --accept=recommended). Makes basic_test 41 PASS again.

Modified:
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1805871&r1=1805870&r2=1805871&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Wed Aug 23 09:36:15 2017
@@ -79,7 +79,7 @@ svn_cl__accept_from_word(const char *wor
       || strcmp(word, "l") == 0 || strcmp(word, ":-l") == 0)
     return svn_cl__accept_launch;
   if (strcmp(word, SVN_CL__ACCEPT_RECOMMENDED) == 0
-      || strcmp(word, "r"))
+      || strcmp(word, "r") == 0)
     return svn_cl__accept_recommended;
   /* word is an invalid action. */
   return svn_cl__accept_invalid;