Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-rename-dir-merge @ 3743:68cddfbbe737
add test for issue436
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 01 Dec 2006 09:42:07 +0100 |
parents | 216e75c721d3 |
children | 7b88bd88f040 |
rev | line source |
---|---|
3733 | 1 #!/bin/sh |
2 | |
3 mkdir t | |
4 cd t | |
5 hg init | |
6 | |
7 mkdir a | |
8 echo foo > a/a | |
9 echo bar > a/b | |
10 | |
11 hg add a | |
12 hg ci -m "0" -d "0 0" | |
13 | |
14 hg co -C 0 | |
15 hg mv a b | |
16 hg ci -m "1 mv a/ b/" -d "0 0" | |
17 | |
18 hg co -C 0 | |
19 echo baz > a/c | |
20 hg add a/c | |
21 hg ci -m "2 add a/c" -d "0 0" | |
22 | |
23 hg merge --debug 1 | |
24 ls a/ b/ | |
25 hg st -C | |
26 hg ci -m "3 merge 2+1" -d "0 0" | |
27 | |
28 hg co -C 1 | |
29 hg merge --debug 2 | |
30 ls a/ b/ | |
31 hg st -C | |
32 hg ci -m "4 merge 1+2" -d "0 0" |