equal
deleted
inserted
replaced
8 |
8 |
9 hg init repo |
9 hg init repo |
10 cd repo |
10 cd repo |
11 |
11 |
12 echo foo > foo |
12 echo foo > foo |
13 hg ci -d '0 0' -qAm 'add foo' |
13 hg ci -qAm 'add foo' |
14 |
14 |
15 echo bar >> foo |
15 echo bar >> foo |
16 hg ci -d '0 0' -m 'change foo' |
16 hg ci -m 'change foo' |
17 |
17 |
18 hg backout -d '0 0' -r tip -m 'backout changed foo' |
18 hg backout -r tip -m 'backout changed foo' |
19 |
19 |
20 hg up -C 0 |
20 hg up -C 0 |
21 touch bar |
21 touch bar |
22 hg ci -d '0 0' -qAm 'add bar' |
22 hg ci -qAm 'add bar' |
23 |
23 |
24 hg merge --debug |
24 hg merge --debug |
25 hg debugstate | grep foo |
25 hg debugstate | grep foo |
26 hg st -A foo |
26 hg st -A foo |
27 hg ci -d '0 0' -m 'merge' |
27 hg ci -m 'merge' |
28 |
28 |
29 hg manifest --debug | grep foo |
29 hg manifest --debug | grep foo |
30 hg debugindex .hg/store/data/foo.i |
30 hg debugindex .hg/store/data/foo.i |
31 |
31 |