r862651 | dlr | 2006-12-05 06:54:54 +0000 (Tue, 05 Dec 2006)
svnmerge: Add a test case for a behavior which we'd like fixed, where
the following sequence results in a property conflict to the
"svnmerge-integrated" directory property.
1. Init branch B
2. Merge changes from branch A to branch B
3. Init branch C, and attempt a merge of changes from branch B to branch C.
(This is the correct incarnation of r22575.)
* contrib/client-side/svnmerge_test.py
(TestCase_TestRepo.testMergeWithPotentialPropertyConflict): Add test
case expecting existing behavior, in hopes of finding a fix.
Found by: Auke Jilderda <auke@collab.net>
John Smith <johnsmith71251@gmail.com>
Raman Gupta <rocketraman@fastmail.fm>