> I wonder if this check is correct for certain edge cases. For example,
> if we have /branches/foo which was copied from /branches/bar which was
> itself copied from /trunk, then a merge from /trunk into a /branches/foo
> WC which has children with explicit mergeinfo would fail your check,
> because the children of /branches/foo were not copied directly from
> /trunk. As a result, those children would be merged as part of the
> top-level do_merge() and potentially cause conflicts.
>
> I think this issue could be fixed in a different way. IIUC, the problem
> is caused by children of the merge target that have explicit mergeinfo
> but whose corresponding merge sources do not exist in the repository.
> The question is, why does get_sw_mergeinfo_paths() select all children
> with explicit mergeinfo and not just those that have explicit mergeinfo
> *for the merge source*?
>
Vlad,
Fixed in r26208.
Thanks again for the nice suggestion.
With regards
Kamesh Jayachandran
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Aug 20 18:15:38 2007