author | Thomas Arendsen Hein <thomas@intevation.de> |
Tue, 07 Aug 2007 10:28:43 +0200 | |
changeset 5117 | d4fa6bafc43a |
parent 4696 | 59b8f9361545 |
permissions | -rwxr-xr-x |
4696
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
1 |
#!/bin/sh |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
2 |
|
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
3 |
# Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
4 |
# (merge correctly when all the files in a directory are moved |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
5 |
# but then local changes are added in the same directory) |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
6 |
|
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
7 |
hg init a |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
8 |
cd a |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
9 |
mkdir -p testdir |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
10 |
echo a > testdir/a |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
11 |
hg add testdir/a |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
12 |
hg commit -u test -d '1000000 0' -m a |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
13 |
cd .. |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
14 |
|
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
15 |
hg clone a b |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
16 |
cd a |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
17 |
echo alpha > testdir/a |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
18 |
hg commit -u test -d '1000000 0' -m remote-change |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
19 |
cd .. |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
20 |
|
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
21 |
cd b |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
22 |
mkdir testdir/subdir |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
23 |
hg mv testdir/a testdir/subdir/a |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
24 |
hg commit -u test -d '1000000 0' -m move |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
25 |
mkdir newdir |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
26 |
echo beta > newdir/beta |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
27 |
hg add newdir/beta |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
28 |
hg commit -u test -d '1000000 0' -m local-addition |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
29 |
hg pull ../a |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
30 |
hg up -C 2 |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
31 |
hg merge |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
32 |
hg stat |
59b8f9361545
tests: add merge test for changeset 9fe267f77f56
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
33 |
hg diff --nodates |