[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Do we need to store redundant mergeinfo?

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Fri, 11 Nov 2011 11:31:55 +0000

Philip Martin <philip.martin_at_wandisco.com> writes:

> Paul Burba <ptburba_at_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
Received on 2011-11-11 12:32:34 CET

This is an archived mail posted to the Subversion Dev mailing list.