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

[Giovanni Bajo]

Raman Gupta <rocketraman at fastmail.fm> wrote:

>> 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.


I know it sucks, but I couldn't come up with something better (without relying
on the Python SVN bindings, which I don't want to depend to). Suggestions are
welcome!

Giovanni Bajo