subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1337844 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Date Sun, 13 May 2012 11:06:30 GMT
Author: stsp
Date: Sun May 13 11:06:29 2012
New Revision: 1337844

URL: http://svn.apache.org/viewvc?rev=1337844&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
  (resolve_conflict_on_node): Restore pre-r1337579 behaviour of setting the
   did_resolve output parameter to FALSE if a text conflict was implicitly
   resolved by removing the conflict marker files. Apparently this is a
   "feature" we want to keep... *grumble*

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=1337844&r1=1337843&r2=1337844&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Sun May 13 11:06:29 2012
@@ -304,7 +304,30 @@ resolve_conflict_on_node(svn_boolean_t *
       SVN_ERR(svn_wc__wq_run(db, local_abspath,
                              cancel_func_t, cancel_baton,
                              pool));
-      *did_resolve = TRUE;
+
+      /* Text conflicts may be marked resolved by removing the conflict
+       * marker files. If they're already deleted, don't provide feedback. */
+      if (resolve_text && !resolve_props && !resolve_tree)
+        {
+          svn_node_kind_t node_kind = svn_node_unknown;
+
+          if (conflict_old)
+            SVN_ERR(svn_io_check_path(conflict_old, &node_kind, pool));
+          *did_resolve = (node_kind == svn_node_file);
+
+          if (!*did_resolve && conflict_new)
+            SVN_ERR(svn_io_check_path(conflict_new, &node_kind, pool));
+          *did_resolve = (node_kind == svn_node_file);
+
+          if (!*did_resolve && conflict_working)
+            SVN_ERR(svn_io_check_path(conflict_working, &node_kind, pool));
+          *did_resolve = (node_kind == svn_node_file);
+        }
+      else
+        {
+          /* Always provide feedback for property and tree conflicts. */
+          *did_resolve = TRUE;
+        }
     }
 
   return SVN_NO_ERROR;



Mime
View raw message