Author: julianfoad
Date: Mon Jun 29 16:04:00 2015
New Revision: 1688258
URL: http://svn.apache.org/r1688258
Log:
Simplify the previous fix for issue #4582 "reintegrate complains about
missing ranges from node unrelated to branch". A follow-up to r1686175.
The first hunk removed here originated in r1666690.
* subversion/libsvn_client/merge.c
(merge_dir_opened): Don't record a path conflicted by an add or
obstruction, don't record the path as 'skipped'.
(record_skips_in_mergeinfo): Remove ignore paths marked as skipped.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1688258&r1=1688257&r2=1688258&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Jun 29 16:04:00 2015
@@ -2794,12 +2794,6 @@ merge_dir_opened(void **new_dir_baton,
db->tree_conflict_reason = added ? svn_wc_conflict_reason_added
:
svn_wc_conflict_reason_obstructed;
-
- if ((merge_b->merge_source.ancestral ||
merge_b->reintegrate_merge)
- && !(pdb && pdb->shadowed))
- {
- store_path(merge_b->skipped_abspaths, local_abspath);
- }
}
}
@@ -5398,14 +5392,6 @@ record_skips_in_mergeinfo(const char *me
|| obstruction_state == svn_wc_notify_state_missing)
continue;
- /* Make sure this is not a tree-conflicted path either. We don't
- * want to add mergeinfo on such nodes since it causes problems down
- * the line (see issue #4582, "reintegrate complains about missing
- * ranges from node unrelated to branch") */
- if (svn_hash_gets(merge_b->tree_conflicted_abspaths,
- skipped_abspath) != NULL)
- continue;
-
/* Add an empty range list for this path.
### TODO: This works fine for a file path skipped because it is
