Mercurial > hg
view tests/test-notify.out @ 5096:ad6b97132b81
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.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sun, 12 Aug 2007 12:15:10 -0300 |
parents | 5371a213b0f4 |
children | 3d1f9dcecdea |
line wrap: on
line source
notify extension - No help text available no commands defined % commit adding a % clone 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % commit % pull (minimal config) pulling from ../a searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files Date: Subject: changeset in test-notify/b: b From: test X-Hg-Notification: changeset 0647d048b600 Message-Id: To: baz, foo@bar changeset 0647d048b600 in test-notify/b details: test-notify/b?cmd=changeset;node=0647d048b600 description: b diffs (6 lines): diff -r cb9a9f314b8b -r 0647d048b600 a --- a/a Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:01 1970 +0000 @@ -1,1 +1,2 @@ a a +a (run 'hg update' to get a working copy) % fail for config file is missing rolling back last transaction pull failed % pull rolling back last transaction pulling from ../a searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files Date: Subject: b From: test@test.com X-Hg-Notification: changeset 0647d048b600 Message-Id: To: baz@test.com, foo@bar changeset 0647d048b600 description: b diffs (6 lines): diff -r cb9a9f314b8b -r 0647d048b600 a --- a/a Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:01 1970 +0000 @@ -1,1 +1,2 @@ a a +a (run 'hg update' to get a working copy)