Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-commit.t
changeset 37283 d4e62df1c73d
parent 37282 009d0283de5f
child 42167 91a0bc50b288 
--- a/tests/test-merge-commit.t	Mon Apr 02 16:28:20 2018 -0700
+++ b/tests/test-merge-commit.t	Mon Apr 02 16:47:53 2018 -0700
@@ -35,17 +35,17 @@
   $ hg ci -m '3: merge with local rename'
 
   $ hg debugindex bar
-     rev    offset  length linkrev nodeid       p1           p2
-       0         0      77       2 d35118874825 000000000000 000000000000
-       1        77      76       3 5345f5ab8abd 000000000000 d35118874825
+     rev linkrev nodeid       p1           p2
+       0       2 d35118874825 000000000000 000000000000
+       1       3 5345f5ab8abd 000000000000 d35118874825
 
   $ hg debugrename bar
   bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
 
   $ hg debugindex foo
-     rev    offset  length linkrev nodeid       p1           p2
-       0         0       7       0 690b295714ae 000000000000 000000000000
-       1         7      13       1 9e25c27b8757 690b295714ae 000000000000
+     rev linkrev nodeid       p1           p2
+       0       0 690b295714ae 000000000000 000000000000
+       1       1 9e25c27b8757 690b295714ae 000000000000
 
 
 Revert the content change from rev 2:
@@ -88,11 +88,11 @@
   $ hg ci -m '5: merge'
 
   $ hg debugindex bar
-     rev    offset  length linkrev nodeid       p1           p2
-       0         0      77       2 d35118874825 000000000000 000000000000
-       1        77      76       3 5345f5ab8abd 000000000000 d35118874825
-       2       153       7       4 ff4b45017382 d35118874825 000000000000
-       3       160      13       5 3701b4893544 ff4b45017382 5345f5ab8abd
+     rev linkrev nodeid       p1           p2
+       0       2 d35118874825 000000000000 000000000000
+       1       3 5345f5ab8abd 000000000000 d35118874825
+       2       4 ff4b45017382 d35118874825 000000000000
+       3       5 3701b4893544 ff4b45017382 5345f5ab8abd
 
 
 Same thing, but with the merge on 3 having the rename
@@ -123,17 +123,17 @@
   $ hg ci -m '3: merge with remote rename'
 
   $ hg debugindex bar
-     rev    offset  length linkrev nodeid       p1           p2
-       0         0      77       2 d35118874825 000000000000 000000000000
-       1        77      76       3 5345f5ab8abd 000000000000 d35118874825
+     rev linkrev nodeid       p1           p2
+       0       2 d35118874825 000000000000 000000000000
+       1       3 5345f5ab8abd 000000000000 d35118874825
 
   $ hg debugrename bar
   bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
 
   $ hg debugindex foo
-     rev    offset  length linkrev nodeid       p1           p2
-       0         0       7       0 690b295714ae 000000000000 000000000000
-       1         7      13       1 9e25c27b8757 690b295714ae 000000000000
+     rev linkrev nodeid       p1           p2
+       0       0 690b295714ae 000000000000 000000000000
+       1       1 9e25c27b8757 690b295714ae 000000000000
 
 
 Revert the content change from rev 2:
@@ -176,10 +176,10 @@
   $ hg ci -m '5: merge'
 
   $ hg debugindex bar
-     rev    offset  length linkrev nodeid       p1           p2
-       0         0      77       2 d35118874825 000000000000 000000000000
-       1        77      76       3 5345f5ab8abd 000000000000 d35118874825
-       2       153       7       4 ff4b45017382 d35118874825 000000000000
-       3       160      13       5 3701b4893544 ff4b45017382 5345f5ab8abd
+     rev linkrev nodeid       p1           p2
+       0       2 d35118874825 000000000000 000000000000
+       1       3 5345f5ab8abd 000000000000 d35118874825
+       2       4 ff4b45017382 d35118874825 000000000000
+       3       5 3701b4893544 ff4b45017382 5345f5ab8abd
 
   $ cd ..
mercurial