[Svnmerge] Reflected blocks

Michael Willmott mwillmott at leadgenpro.co.uk
Wed Jul 11 06:24:22 PDT 2007


Giovanni Bajo wrote:
>> Thanks Michael.  Rich's related patch is here:
>>
>> http://article.gmane.org/gmane.comp.version-control.subversion.svnmerge.devel/310
> 
> I reviewed this patch and it is OK to commit it. There were some 
> comments to unify it to my patch to not show block revisions in 
> bidirectional merges, but I disagree with that, as they need different 
> codepaths anyway.
> 
> I would *love* if someone wrote a testcase for this though.

Ok, I've produced a new diff against the current svn trunk and will see 
if I can put a testcase together for this before I put it on the tracker.

-- 
Michael Willmott




More information about the Svnmerge mailing list