Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-clone-r @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -0500 |
parents | d4a3a8a332ab |
children | c0b449154a90 |
rev | line source |
---|---|
1886 | 1 #!/bin/sh |
1468
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
2 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
3 hg init test |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
4 cd test |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
5 cat >>afile <<EOF |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
6 0 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
7 EOF |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
8 hg add afile |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
9 hg commit -m "0.0" |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
10 cat >>afile <<EOF |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
11 1 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
12 EOF |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
13 hg commit -m "0.1" |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
14 cat >>afile <<EOF |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
15 2 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
16 EOF |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
17 hg commit -m "0.2" |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
18 cat >>afile <<EOF |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
19 3 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
20 EOF |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
21 hg commit -m "0.3" |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
22 hg update -C 0 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
23 cat >>afile <<EOF |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
24 1 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
25 EOF |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
26 hg commit -m "1.1" |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
27 cat >>afile <<EOF |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
28 2 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
29 EOF |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
30 hg commit -m "1.2" |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
31 cat >fred <<EOF |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
32 a line |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
33 EOF |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
34 cat >>afile <<EOF |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
35 3 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
36 EOF |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
37 hg add fred |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
38 hg commit -m "1.3" |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
39 hg mv afile adifferentfile |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
40 hg commit -m "1.3m" |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
41 hg update -C 3 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
42 hg mv afile anotherfile |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
43 hg commit -m "0.3m" |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
44 hg debugindex .hg/data/afile.i |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
45 hg debugindex .hg/data/adifferentfile.i |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
46 hg debugindex .hg/data/anotherfile.i |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
47 hg debugindex .hg/data/fred.i |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
48 hg debugindex .hg/00manifest.i |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
49 hg verify |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
50 cd .. |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
51 for i in 0 1 2 3 4 5 6 7 8; do |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
52 hg clone -r "$i" test test-"$i" |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
53 cd test-"$i" |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
54 hg verify |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
55 cd .. |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
56 done |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
57 cd test-8 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
58 hg pull ../test-7 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
59 hg verify |