[Svnmerge] [PATCH] Transitive merge fix

[Raman Gupta]

Giovanni Bajo wrote:
> On 8/10/2007 5:58 PM, Raman Gupta wrote:
>> Michael Willmott wrote:
>>> Raman Gupta wrote:
>>>> The attached patch uses the VersionedProperty cache.
>>> Brief testing here suggests this is working.  -vv output seems to show
>>> only a minimum of extra propgets in the unidirectional case, and no
>>> additional propgets in the bidirectional case.
>>
>> Great, thanks for testing it Michael.
>>
>> Giovanni, do you have any other comments? I'll aim to commit this over
>> the weekend, assuming nobody else has any objections.
> 
> I think it's fine on the basis that the cure is better than the original
> disease. Also, blocking revisions is probably less used than merges, so
> the number of propgets should not typically be overwhelming.

Committed in rev 26037.

Cheers,
Raman Gupta