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

[st...@apache.org]

Author: stsp
Date: Sun May 13 12:47:40 2012
New Revision: 1337860

URL: http://svn.apache.org/viewvc?rev=1337860&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
  (resolve_conflict_on_node): Check for text conflict marker files before
   removing them from disk, not after.

Found by: rhuijben

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=1337860&r1=1337859&r2=1337860&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Sun May 13 12:47:40 2012
@@ -301,9 +301,6 @@ resolve_conflict_on_node(svn_boolean_t *
       SVN_ERR(svn_wc__db_op_mark_resolved(db, local_abspath,
                                           resolve_text, resolve_props,
                                           resolve_tree, work_items, pool));
-      SVN_ERR(svn_wc__wq_run(db, local_abspath,
-                             cancel_func_t, cancel_baton,
-                             pool));
 
       /* Text conflicts may be marked resolved by removing the conflict
        * marker files. If they're already deleted, don't provide feedback. */
@@ -328,6 +325,11 @@ resolve_conflict_on_node(svn_boolean_t *
           /* Always provide feedback for property and tree conflicts. */
           *did_resolve = TRUE;
         }
+
+      /* Run the work queue to remove conflict marker files. */
+      SVN_ERR(svn_wc__wq_run(db, local_abspath,
+                             cancel_func_t, cancel_baton,
+                             pool));
     }
 
   return SVN_NO_ERROR;