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

A patch for the test_svnmerge.py is attached. This patch adds a test
case for the __len__ function I added to RevisionsList to
TestCase_RevisionList, as well as two test cases for bidi functionality
in TestCase_TestRepo.

Because the bidi functionality tests required commits, I had to modify
the TestCase_TestRepo class slightly to call svn switch --relocate in
the setUp. This changes the working path's base URLs from the template
repository to the working repository, allowing each test to commit to
its own sandbox without screwing up the other tests.

Comments are of course welcome.

Cheers,
Raman Gupta

-------------- next part --------------
A non-text attachment was scrubbed...
Name: bidi-test.patch
Type: text/x-patch
Size: 8489 bytes
Desc: not available
Url : /pipermail/svnmerge/attachments/20060220/8b8e35d8/attachment.bin