equal
deleted
inserted
replaced
|
1 #!/bin/sh |
|
2 |
|
3 hg init |
|
4 |
|
5 echo foo > a |
|
6 echo foo > b |
|
7 hg add a b |
|
8 |
|
9 hg ci -m "test" -d "0 0" |
|
10 |
|
11 echo blah > a |
|
12 |
|
13 hg ci -m "branch a" -d "0 0" |
|
14 |
|
15 hg co 0 |
|
16 |
|
17 echo blah > b |
|
18 |
|
19 hg ci -m "branch b" -d "0 0" |
|
20 HGMERGE=true hg up -m 1 |
|
21 |
|
22 hg ci -m "merge b/a -> blah" -d "0 0" |
|
23 |
|
24 hg co 1 |
|
25 HGMERGE=true hg up -m 2 |
|
26 hg ci -m "merge a/b -> blah" -d "0 0" |
|
27 |
|
28 hg log |
|
29 hg debugindex .hg/00changelog.i |
|
30 |
|
31 echo |
|
32 |
|
33 echo 1 |
|
34 hg manifest 1 |
|
35 echo 2 |
|
36 hg manifest 2 |
|
37 echo 3 |
|
38 hg manifest 3 |
|
39 echo 4 |
|
40 hg manifest 4 |
|
41 |
|
42 echo |
|
43 |
|
44 hg debugindex .hg/data/a.i |
|
45 |
|
46 hg verify |