Auke Jilderda <auke@collab.net>


Found
r863582, r862651, r861971

r863582 | dlr | 2007-02-27 17:32:53 -0600 (Tue, 27 Feb 2007)

* www/merge-tracking/requirements.html
  (rename-tracking): Fix broken link.

Found by: Auke Jilderda <auke@collab.net>


r862651 | dlr | 2006-12-05 00:54:54 -0600 (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>


r861971 | dlr | 2006-10-11 19:00:23 -0500 (Wed, 11 Oct 2006)

Add validation to svnmerge.py to prevent initialization of a WC's
merge source to its own repository-relative path.

* contrib/client-side/svnmerge.py
  (main): Block initialization of "." (and equivalent URLs) as a WC
   path's integration source.

* contrib/client-side/svnmerge_test.py
  (testSelfReferentialInit): New test method which asserts that
  'svnmerge.py init .' and the equivalent for URLs will fail.

  (testUninitForce): Avoid using the repository-relative path of the
   WC as the HEAD argument to 'init' (otherwise, we trigger this new
   validation).

Found by: Auke Jilderda <auke@collab.net>
Reviewed by: djames