equal
deleted
inserted
replaced
15 echo 1 > foo |
15 echo 1 > foo |
16 echo 1 > bar |
16 echo 1 > bar |
17 echo 1 > baz |
17 echo 1 > baz |
18 echo 1 > quux |
18 echo 1 > quux |
19 hg add foo bar baz quux |
19 hg add foo bar baz quux |
20 hg commit -m "base" -d "1000000 0" |
20 hg commit -m "base" |
21 |
21 |
22 cd .. |
22 cd .. |
23 hg clone a b |
23 hg clone a b |
24 |
24 |
25 echo creating branch a |
25 echo creating branch a |
26 cd a |
26 cd a |
27 echo 2a > foo |
27 echo 2a > foo |
28 echo 2a > bar |
28 echo 2a > bar |
29 hg commit -m "branch a" -d "1000000 0" |
29 hg commit -m "branch a" |
30 |
30 |
31 echo creating branch b |
31 echo creating branch b |
32 |
32 |
33 cd .. |
33 cd .. |
34 cd b |
34 cd b |
35 echo 2b > foo |
35 echo 2b > foo |
36 echo 2b > baz |
36 echo 2b > baz |
37 hg commit -m "branch b" -d "1000000 0" |
37 hg commit -m "branch b" |
38 |
38 |
39 echo "we shouldn't have anything but n state here" |
39 echo "we shouldn't have anything but n state here" |
40 hg debugstate --nodates | grep -v "^n" |
40 hg debugstate --nodates | grep -v "^n" |
41 |
41 |
42 echo merging |
42 echo merging |
48 echo new > quux |
48 echo new > quux |
49 |
49 |
50 echo "we shouldn't have anything but foo in merge state here" |
50 echo "we shouldn't have anything but foo in merge state here" |
51 hg debugstate --nodates | grep "^m" |
51 hg debugstate --nodates | grep "^m" |
52 |
52 |
53 hg ci -m "merge" -d "1000000 0" |
53 hg ci -m "merge" |
54 |
54 |
55 echo "main: we should have a merge here" |
55 echo "main: we should have a merge here" |
56 hg debugindex .hg/store/00changelog.i |
56 hg debugindex .hg/store/00changelog.i |
57 |
57 |
58 echo "log should show foo and quux changed" |
58 echo "log should show foo and quux changed" |