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

Posted to commits@subversion.apache.org by br...@apache.org on 2014/03/13 20:27:43 UTC

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

Author: breser
Date: Thu Mar 13 19:27:42 2014
New Revision: 1577294

URL: http://svn.apache.org/r1577294
Log:
Fix a typo added in r1440411 that makes 'r' always allowed in the interactive
conflict resolver.

* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Change from result->choice to opt->choice.  The
    value in result->choice is not set at this point.

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=1577294&r1=1577293&r2=1577294&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Mar 13 19:27:42 2014
@@ -916,7 +916,7 @@ handle_text_conflict(svn_wc_conflict_res
           /* We only allow the user accept the merged version of
              the file if they've edited it, or at least looked at
              the diff. */
-          if (result->choice == svn_wc_conflict_choose_merged
+          if (opt->choice == svn_wc_conflict_choose_merged
               && ! knows_something)
             {
               SVN_ERR(svn_cmdline_fprintf(