Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-filebranch @ 3853:c0b449154a90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
switch to the .hg/store layout, fix the tests
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 01 Dec 2006 13:34:09 +0100
parents ad3d5b4367cb
children b0140ead7f70
comparison
equal deleted inserted replaced
3852:8a9a1a7e1698 3853:c0b449154a90
51 hg debugstate | cut -b 1-16,35- | grep "^m" 51 hg debugstate | cut -b 1-16,35- | 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/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"
59 hg log -v -r tip 59 hg log -v -r tip
60 60
61 echo "foo: we should have a merge here" 61 echo "foo: we should have a merge here"
62 hg debugindex .hg/data/foo.i 62 hg debugindex .hg/store/data/foo.i
63 63
64 echo "bar: we shouldn't have a merge here" 64 echo "bar: we shouldn't have a merge here"
65 hg debugindex .hg/data/bar.i 65 hg debugindex .hg/store/data/bar.i
66 66
67 echo "baz: we shouldn't have a merge here" 67 echo "baz: we shouldn't have a merge here"
68 hg debugindex .hg/data/baz.i 68 hg debugindex .hg/store/data/baz.i
69 69
70 echo "quux: we shouldn't have a merge here" 70 echo "quux: we shouldn't have a merge here"
71 hg debugindex .hg/data/quux.i 71 hg debugindex .hg/store/data/quux.i
72 72
73 echo "manifest entries should match tips of all files" 73 echo "manifest entries should match tips of all files"
74 hg manifest --debug 74 hg manifest --debug
75 75
76 echo "everything should be clean now" 76 echo "everything should be clean now"