mercurial-crew-with-dirclash: tests/test-merge2.out@ad6b97132b81 (annotated)

merge: fix a copy detection bug (issue672) When merging rev1 and rev2, we want to search for copies that happened in rev1 but not in rev2 and vice-versa. We were starting the search at rev1/rev2 and then going back, stopping as soon as we reached the revno of the ancestor, but that can miss some cases (see the new test-issue672). Now we calculate the revisions that are ancestors of rev1 or rev2 (but not both) and make sure the search doesn't stop too early. Simplified test provided by mpm, based on a test case provided by Edward Lee.

2175 b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 925 diff changeset	1	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 925 diff changeset	2	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
767 61ed30e82b27 Update tests to match new addremove chattiness. Bryan O'Sullivan <bos@serpentine.com> parents: 749 diff changeset	3	adding b
2175 b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 925 diff changeset	4	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
767 61ed30e82b27 Update tests to match new addremove chattiness. Bryan O'Sullivan <bos@serpentine.com> parents: 749 diff changeset	5	adding b

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
	Sun, 12 Aug 2007 12:15:10 -0300
changeset 5149	ad6b97132b81
parent 2175	b2ae81a7df29
permissions	-rw-r--r--