[Svnmerge] [PATCH] Handle transitive merging propertyconflictsforbothmerged/blockedrevs

[Raman Gupta]

Piet-Hein Peeters wrote:
> svnmerge-bounces+piet-hein.peeters=philips.com at orcaware.com wrote on
> 08/07/2007 04:08:12 PM:
> 
>> Piet-Hein Peeters wrote:
>> > The simpler test case:
>> >
>> > merge from trunk -> branch1 ->branch2
>>
>> How does this differ from testTransitiveMerge in svnmerge_test.py?
> 
> I think there is no difference.

Does that test fail in your environment? It passes in mine:

$ svn up
At revision 25977.

$ ./svnmerge_test.py
................................................
----------------------------------------------------------------------
Ran 48 tests in 98.240s

OK

Cheers,
Raman