Philip Martin <philip.mar...@wandisco.com> writes:

> Paul Burba <ptbu...@gmail.com> writes:
>
>> Does this answer your question at all (or did I answer a different
>> question ;-)
>
> That's the cyclic merge again.  Storing the transitive mergeinfo makes
> cyclic merge work in some circumstances but not in others.  What we are
> trying to determine is whether that is the only use for transitive
> mergeinfo.

A bit of confusion on my part, failing to recognise the difference
between catch-up merge and a cherry-pick merge.  Cyclic catch-up merges
can lead to conflicts due to merge tracking limitations, and the
transitive mergeinfo doesn't really help.  But I can see that for
cherry-pick merges the transitive mergeinfo will probably be useful in
more cases.

-- 
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com

Reply via email to