Author: rinrab
Date: Thu Nov 28 18:08:11 2024
New Revision: 1922195
URL: http://svn.apache.org/viewvc?rev=1922195&view=rev
Log:
On the 'apply-processor' branch: Follow-up to r1922090: don't forget a
check before storing path in the tree-conflicted collection back.
* subversion/libsvn_client/merge.c
(notify_merging:svn_wc_notify_tree_conflict): Check merge for ancestral
or reintegrate_merge before storing the path in tree_conflicted_abspaths;
This doesn't affect the conflicted_paths collection.
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=1922195&r1=1922194&r2=1922195&view=diff
==============================================================================
--- subversion/branches/apply-processor/subversion/libsvn_client/merge.c
(original)
+++ subversion/branches/apply-processor/subversion/libsvn_client/merge.c Thu
Nov 28 18:08:11 2024
@@ -1341,10 +1341,14 @@ notify_merging(void *baton,
break;
case svn_wc_notify_tree_conflict:
+ if (merge_b->merge_source.ancestral || merge_b->reintegrate_merge)
+ {
+ alloc_and_store_path(&merge_b->tree_conflicted_abspaths, notify->path,
+ merge_b->pool);
+ }
+
alloc_and_store_path(&merge_b->conflicted_paths, notify->path,
merge_b->pool);
- alloc_and_store_path(&merge_b->tree_conflicted_abspaths, notify->path,
- merge_b->pool);
break;
}
