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/01/20 23:36:09 UTC

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

Author: stsp
Date: Fri Jan 20 23:36:09 2017
New Revision: 1779690

URL: http://svn.apache.org/viewvc?rev=1779690&view=rev
Log:
Follow-up to 1779687: Fix postponing conflicts.

* subversion/svn/conflict-callbacks.c
  (svn_cl__resolve_conflict): Don't mark conflicts resolved if the user
   wants to postpone them. Silly bug.

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=1779690&r1=1779689&r2=1779690&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Fri Jan 20 23:36:09 2017
@@ -2115,7 +2115,7 @@ svn_cl__resolve_conflict(svn_boolean_t *
           SVN_ERR(err);
         }
     }
-  else
+  else if (option_id != svn_client_conflict_option_postpone)
     SVN_ERR(mark_conflict_resolved(conflict, option_id,
                                    text_conflicted,
                                    props_conflicted->nelts > 0 ? "" : NULL,