Author: julianfoad Revision: 1688258 Modified property: svn:log Modified: svn:log at Mon Jun 29 16:36:18 2015 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Mon Jun 29 16:36:18 2015 @@ -4,6 +4,8 @@ missing ranges from node unrelated to br 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. + (merge_dir_opened): For a path conflicted by an add or obstruction, no + longer record the path as 'skipped', and so allow it to inherit the + updated mergeinfo as usual. + (record_skips_in_mergeinfo): No longer ignore skipped paths that also have + a tree conflict.
