svn commit: r1922201 - /subversion/branches/apply-processor/subversion/libsvn_client/merge.c

[rinrab]

Author: rinrab
Date: Thu Nov 28 22:04:08 2024
New Revision: 1922201

URL: http://svn.apache.org/viewvc?rev=1922201&view=rev
Log:
On the 'apply-processor' branch: Check whereas tree-conflicts are supported
in the merge, we are currently running. This is a follow-up to r1922090 (add
callbacks for notifying merge.c from merge_processor.c).

* subversion/libsvn_client/merge.c
  (apply_processor_conflicted_path): Ditto.

Modified:
    subversion/branches/apply-processor/subversion/libsvn_client/merge.c

Modified: subversion/branches/apply-processor/subversion/libsvn_client/merge.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/apply-processor/subversion/libsvn_client/merge.c?rev=1922201&r1=1922200&r2=1922201&view=diff
==============================================================================
--- subversion/branches/apply-processor/subversion/libsvn_client/merge.c 
(original)
+++ subversion/branches/apply-processor/subversion/libsvn_client/merge.c Thu 
Nov 28 22:04:08 2024
@@ -7251,10 +7251,13 @@ apply_processor_conflicted_path(void *ba
   alloc_and_store_path(&merge_b->conflicted_paths, local_abspath,
                        merge_b->pool);
 
-  if (tree_conflict)
-    alloc_and_store_path(&merge_b->tree_conflicted_abspaths, 
-                         local_abspath,
-                         merge_b->pool);
+  if ((merge_b->merge_source.ancestral || merge_b->reintegrate_merge)
+      && tree_conflict)
+    {
+      alloc_and_store_path(&merge_b->tree_conflicted_abspaths,
+                           local_abspath,
+                           merge_b->pool);
+    }
 
   return SVN_NO_ERROR;
 }