Mercurial > public > mercurial-scm > hg-stable

diff tests/test-merge-commit.t @ 14182:ec5886db9dc6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix deprecated use of hg debugdata/debugindex For filelogs, debugindex and debugdata can be called with the file name directly instead of the path to the revlog. Since in the future filelogs will no longer be valid revlogs, calling with a path to the revlog is deprecated for debugdata. For debugindex it is expected to still work, but I changed them as well for consistency.
author Sune Foldager <cryo@cyanite.org>
date Wed, 04 May 2011 13:37:41 +0200
parents b00eda50ad2b
children efdcce3fd2d5
line wrap: on
line diff
--- 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