equal
deleted
inserted
replaced
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" -d "1000000 0" |
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 | cut -b 1-16,35- |
40 hg debugstate | cut -b 1-16,37- |
41 |
41 |
42 echo merging |
42 echo merging |
43 hg pull ../a |
43 hg pull ../a |
44 hg merge -v |
44 hg merge -v |
45 |
45 |
46 echo 2m > foo |
46 echo 2m > foo |
47 echo 2b > baz |
47 echo 2b > baz |
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 | cut -b 1-16,35- | grep "^m" |
51 hg debugstate | cut -b 1-16,37- | grep "^m" |
52 |
52 |
53 hg ci -m "merge" -d "1000000 0" |
53 hg ci -m "merge" -d "1000000 0" |
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 |