Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge6 @ 1948:ebe273a16048
merge with crew/templates
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Mon, 13 Mar 2006 23:38:14 +0100 |
parents | 7544700fd931 |
children | e506c14382fd |
comparison
equal
deleted
inserted
replaced
1946:9fee186f7f0d | 1948:ebe273a16048 |
---|---|
11 cd A1 | 11 cd A1 |
12 hg init | 12 hg init |
13 echo This is file foo1 > foo | 13 echo This is file foo1 > foo |
14 echo This is file bar1 > bar | 14 echo This is file bar1 > bar |
15 hg add foo bar | 15 hg add foo bar |
16 hg commit -m "commit text" -d "0 0" | 16 hg commit -m "commit text" -d "1000000 0" |
17 | 17 |
18 cd .. | 18 cd .. |
19 hg clone A1 B1 | 19 hg clone A1 B1 |
20 | 20 |
21 cd A1 | 21 cd A1 |
22 rm bar | 22 rm bar |
23 hg remove bar | 23 hg remove bar |
24 hg commit -m "commit test" -d "0 0" | 24 hg commit -m "commit test" -d "1000000 0" |
25 | 25 |
26 cd ../B1 | 26 cd ../B1 |
27 echo This is file foo22 > foo | 27 echo This is file foo22 > foo |
28 hg commit -m "commit test" -d "0 0" | 28 hg commit -m "commit test" -d "1000000 0" |
29 | 29 |
30 cd .. | 30 cd .. |
31 hg clone A1 A2 | 31 hg clone A1 A2 |
32 hg clone B1 B2 | 32 hg clone B1 B2 |
33 | 33 |
34 cd A1 | 34 cd A1 |
35 hg pull ../B1 | 35 hg pull ../B1 |
36 hg update -m | 36 hg update -m |
37 hg commit -m "commit test" -d "0 0" | 37 hg commit -m "commit test" -d "1000000 0" |
38 echo bar should remain deleted. | 38 echo bar should remain deleted. |
39 hg manifest | 39 hg manifest |
40 | 40 |
41 cd ../B2 | 41 cd ../B2 |
42 hg pull ../A2 | 42 hg pull ../A2 |
43 hg update -m | 43 hg update -m |
44 hg commit -m "commit test" -d "0 0" | 44 hg commit -m "commit test" -d "1000000 0" |
45 echo bar should remain deleted. | 45 echo bar should remain deleted. |
46 hg manifest | 46 hg manifest |