Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge10 @ 4696:59b8f9361545
tests: add merge test for changeset 9fe267f77f56
When all the files in a directory are moved somewhere else, and new
files are added in changesets of the local branch, a subsequent pull
and merge shouldn't rename the locally added files too.
author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
---|---|
date | Sat, 23 Jun 2007 22:43:46 -0500 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
4695:c3da7b6cc975 | 4696:59b8f9361545 |
---|---|
1 #!/bin/sh | |
2 | |
3 # Test for changeset 9fe267f77f56ff127cf7e65dc15dd9de71ce8ceb | |
4 # (merge correctly when all the files in a directory are moved | |
5 # but then local changes are added in the same directory) | |
6 | |
7 hg init a | |
8 cd a | |
9 mkdir -p testdir | |
10 echo a > testdir/a | |
11 hg add testdir/a | |
12 hg commit -u test -d '1000000 0' -m a | |
13 cd .. | |
14 | |
15 hg clone a b | |
16 cd a | |
17 echo alpha > testdir/a | |
18 hg commit -u test -d '1000000 0' -m remote-change | |
19 cd .. | |
20 | |
21 cd b | |
22 mkdir testdir/subdir | |
23 hg mv testdir/a testdir/subdir/a | |
24 hg commit -u test -d '1000000 0' -m move | |
25 mkdir newdir | |
26 echo beta > newdir/beta | |
27 hg add newdir/beta | |
28 hg commit -u test -d '1000000 0' -m local-addition | |
29 hg pull ../a | |
30 hg up -C 2 | |
31 hg merge | |
32 hg stat | |
33 hg diff --nodates |