Mercurial > hg
diff tests/test-filebranch @ 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 | b0140ead7f70 |
line wrap: on
line diff
--- a/tests/test-filebranch Sun Dec 10 01:05:00 2006 -0600 +++ b/tests/test-filebranch Sun Dec 10 02:11:02 2006 -0600 @@ -53,22 +53,22 @@ hg ci -m "merge" -d "1000000 0" echo "main: we should have a merge here" -hg debugindex .hg/00changelog.i +hg debugindex .hg/store/00changelog.i echo "log should show foo and quux changed" hg log -v -r tip echo "foo: we should have a merge here" -hg debugindex .hg/data/foo.i +hg debugindex .hg/store/data/foo.i echo "bar: we shouldn't have a merge here" -hg debugindex .hg/data/bar.i +hg debugindex .hg/store/data/bar.i echo "baz: we shouldn't have a merge here" -hg debugindex .hg/data/baz.i +hg debugindex .hg/store/data/baz.i echo "quux: we shouldn't have a merge here" -hg debugindex .hg/data/quux.i +hg debugindex .hg/store/data/quux.i echo "manifest entries should match tips of all files" hg manifest --debug