[Svnmerge] [PATCH] Bidirectional merging patch for svnmerge.py

[Raman Gupta]

Giovanni Bajo wrote:
> Raman Gupta <rocketraman at fastmail.fm> wrote:
> 
>>> Attached is a bidirectional merging patch for the latest version of
>>> svnmerge.py (rev 238).
> 
> I forgot: you should also try and provide a testcase for this. svnmerge's
> testsuite is not very handy to use and it's still missing tests for
> block/unblock, but it's still better than nothing and I'd like svnmerge not to
> grow untested options.

Yeah, I wanted to but when I looked at the test file, I thought "big
pointy teeth!" and ran away. I'll take another look.

Cheers,
Raman Gupta