Mercurial > hg
annotate tests/test-clone @ 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 | ba198d17eea9 |
children | 76c4cadb49fc |
rev | line source |
---|---|
834
78a9f95766dc
Use sh instead of bash in tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
1 #!/bin/sh |
550 | 2 |
3 mkdir a | |
4 cd a | |
5 hg init | |
6 echo a > a | |
7 hg add a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
550
diff
changeset
|
8 hg commit -m test -d '0 0' |
550 | 9 |
10 # Default operation | |
11 hg clone . ../b | |
12 cd ../b | |
13 cat a | |
14 hg verify | |
15 | |
16 # No update | |
17 hg clone -U . ../c | |
18 cd ../c | |
1926
ba198d17eea9
changes by John Levon to standardize some erroroutput
Peter van Dijk <peter@dataloss.nl>
parents:
839
diff
changeset
|
19 cat a 2>/dev/null || echo "a not present" |
550 | 20 hg verify |
21 | |
22 # Default destination | |
23 mkdir ../d | |
24 cd ../d | |
25 hg clone ../a | |
26 cd a | |
27 hg cat a |