Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-branch @ 3068:547d1a4aa105
hg merge: fix lookup of branch
add some tests for branch usage
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 08 Sep 2006 02:16:16 +0200 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
3067:9b480509658c | 3068:547d1a4aa105 |
---|---|
1 #!/bin/sh | |
2 # | |
3 # test for branch handling | |
4 # | |
5 # XXX: need more tests | |
6 | |
7 hg init | |
8 echo a > a | |
9 echo b > b | |
10 hg ci -A -m 0 -d "1000000 0" | |
11 echo aa > a | |
12 echo bb > b | |
13 hg ci -m 1 -d "1000000 0" | |
14 hg tag -l foo | |
15 hg update 0 | |
16 hg parents -b | |
17 | |
18 # test update | |
19 hg update -b foo | |
20 hg parents | |
21 | |
22 # test merge | |
23 hg update 0 | |
24 echo c > c | |
25 hg ci -A -m 0.0 -d "1000000 0" | |
26 hg merge -b foo | |
27 hg parents -b | |
28 | |
29 # re-test with more branches | |
30 hg update -C 0 | |
31 echo d > d | |
32 hg ci -A -m 0.0 -d "1000000 0" | |
33 hg merge -b foo | |
34 hg parents -b |