Mercurial > hg
comparison tests/test-excessive-merge @ 3854:4f6db0233606
Merge Benoit's .hg/store support
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 10 Dec 2006 02:11:02 -0600 |
parents | c0b449154a90 |
children |
comparison
equal
deleted
inserted
replaced
3848:8cbf060f637e | 3854:4f6db0233606 |
---|---|
24 hg co 1 | 24 hg co 1 |
25 HGMERGE=true hg merge 2 | 25 HGMERGE=true hg merge 2 |
26 hg ci -m "merge a/b -> blah" -d "1000000 0" | 26 hg ci -m "merge a/b -> blah" -d "1000000 0" |
27 | 27 |
28 hg log | 28 hg log |
29 hg debugindex .hg/00changelog.i | 29 hg debugindex .hg/store/00changelog.i |
30 | 30 |
31 echo | 31 echo |
32 | 32 |
33 echo 1 | 33 echo 1 |
34 hg manifest --debug 1 | 34 hg manifest --debug 1 |
39 echo 4 | 39 echo 4 |
40 hg manifest --debug 4 | 40 hg manifest --debug 4 |
41 | 41 |
42 echo | 42 echo |
43 | 43 |
44 hg debugindex .hg/data/a.i | 44 hg debugindex .hg/store/data/a.i |
45 | 45 |
46 hg verify | 46 hg verify |