--- a/tests/test-merge-commit.t Tue May 03 22:28:08 2011 +0200
+++ b/tests/test-merge-commit.t Wed May 04 13:37:41 2011 +0200
@@ -34,7 +34,7 @@
$ hg ci -m '3: merge with local rename'
- $ hg debugindex .hg/store/data/bar.i
+ $ hg debugindex bar
rev offset length base linkrev nodeid p1 p2
0 0 77 0 2 d35118874825 000000000000 000000000000
1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825
@@ -42,7 +42,7 @@
$ hg debugrename bar
bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
- $ hg debugindex .hg/store/data/foo.i
+ $ hg debugindex foo
rev offset length base linkrev nodeid p1 p2
0 0 7 0 0 690b295714ae 000000000000 000000000000
1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000
@@ -87,7 +87,7 @@
$ hg ci -m '5: merge'
- $ hg debugindex .hg/store/data/bar.i
+ $ hg debugindex bar
rev offset length base linkrev nodeid p1 p2
0 0 77 0 2 d35118874825 000000000000 000000000000
1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825
@@ -121,7 +121,7 @@
$ hg ci -m '3: merge with remote rename'
- $ hg debugindex .hg/store/data/bar.i
+ $ hg debugindex bar
rev offset length base linkrev nodeid p1 p2
0 0 77 0 2 d35118874825 000000000000 000000000000
1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825
@@ -129,7 +129,7 @@
$ hg debugrename bar
bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
- $ hg debugindex .hg/store/data/foo.i
+ $ hg debugindex foo
rev offset length base linkrev nodeid p1 p2
0 0 7 0 0 690b295714ae 000000000000 000000000000
1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000
@@ -174,7 +174,7 @@
$ hg ci -m '5: merge'
- $ hg debugindex .hg/store/data/bar.i
+ $ hg debugindex bar
rev offset length base linkrev nodeid p1 p2
0 0 77 0 2 d35118874825 000000000000 000000000000
1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825