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

Posted to commits@subversion.apache.org by rh...@apache.org on 2012/07/05 16:06:45 UTC

svn commit: r1357617 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

Author: rhuijben
Date: Thu Jul  5 14:06:45 2012
New Revision: 1357617

URL: http://svn.apache.org/viewvc?rev=1357617&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
  (svn_wc__conflict_invoke_resolver): Run the workqueue after resolving a text
    conflict.

Modified:
    subversion/trunk/subversion/libsvn_wc/conflicts.c

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1357617&r1=1357616&r2=1357617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Thu Jul  5 14:06:45 2012
@@ -1903,6 +1903,7 @@ svn_wc__conflict_invoke_resolver(svn_wc_
         {
           SVN_ERR(svn_wc__db_op_mark_resolved(db, local_abspath, TRUE, FALSE,
                                               FALSE, work_item, scratch_pool));
+          SVN_ERR(svn_wc__wq_run(db, local_abspath, NULL, NULL, scratch_pool));
         }
     }