equal
deleted
inserted
replaced
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,35- |
41 |
41 |
42 echo merging |
42 echo merging |
43 hg pull ../a |
43 hg pull ../a |
44 env HGMERGE=../merge hg update -vm --debug |
44 env HGMERGE=../merge hg update -vm |
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 |
53 hg ci -m "merge" -d "0 0" |
53 hg ci -m "merge" -d "0 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/00changelog.i |
56 hg debugindex .hg/00changelog.i |
57 |
57 |
|
58 echo "log should show foo and quux changed" |
|
59 hg log -v -r tip |
|
60 |
58 echo "foo: we should have a merge here" |
61 echo "foo: we should have a merge here" |
59 hg debugindex .hg/data/foo.i |
62 hg debugindex .hg/data/foo.i |
60 |
63 |
61 echo "bar: we shouldn't have a merge here" |
64 echo "bar: we shouldn't have a merge here" |
62 hg debugindex .hg/data/bar.i |
65 hg debugindex .hg/data/bar.i |
65 hg debugindex .hg/data/baz.i |
68 hg debugindex .hg/data/baz.i |
66 |
69 |
67 echo "quux: we shouldn't have a merge here" |
70 echo "quux: we shouldn't have a merge here" |
68 hg debugindex .hg/data/quux.i |
71 hg debugindex .hg/data/quux.i |
69 |
72 |
|
73 echo "manifest entries should match tips of all files" |
|
74 hg manifest |
|
75 |
70 echo "everything should be clean now" |
76 echo "everything should be clean now" |
71 hg status |
77 hg status |
72 |
78 |
73 hg verify |
79 hg verify |