Mercurial > hg
view tests/test-remove.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 | a6436e9333db |
children | 0750f11152fe |
line wrap: on
line source
not removing foo: file is not managed abort: no files specified undeleting foo removing foo # HG changeset patch # User test # Date 1000000 0 # Node ID 8ba83d44753d6259db5ce6524974dd1174e90f47 # Parent 0000000000000000000000000000000000000000 1 diff -r 000000000000 -r 8ba83d44753d foo --- /dev/null +++ b/foo @@ -0,0 +1,1 @@ +a # HG changeset patch # User test # Date 1000000 0 # Node ID a1fce69c50d97881c5c014ab23f580f720c78678 # Parent 8ba83d44753d6259db5ce6524974dd1174e90f47 2 diff -r 8ba83d44753d -r a1fce69c50d9 foo --- a/foo +++ /dev/null @@ -1,1 +0,0 @@ -a changeset: 0:8ba83d44753d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 1 diff -r 000000000000 -r 8ba83d44753d foo --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/foo Mon Jan 12 13:46:40 1970 +0000 @@ -0,0 +1,1 @@ +a changeset: 1:a1fce69c50d9 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: 2 diff -r 8ba83d44753d -r a1fce69c50d9 foo --- a/foo Mon Jan 12 13:46:40 1970 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -a not removing a: file has been marked for add (use -f to force removal) adding a adding b adding c/d not removing b: file is modified (use -f to force removal) R b R c/d d undeleting c/d R b R b removing c/d R b R c/d 3 files updated, 0 files merged, 0 files removed, 0 files unresolved