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-filebranch.t
changeset 37283 d4e62df1c73d
parent 37282 009d0283de5f
child 39489 f1186c292d03 
--- a/tests/test-filebranch.t	Mon Apr 02 16:28:20 2018 -0700
+++ b/tests/test-filebranch.t	Mon Apr 02 16:47:53 2018 -0700
@@ -73,11 +73,11 @@
 main: we should have a merge here:
 
   $ hg debugindex --changelog
-     rev    offset  length linkrev nodeid       p1           p2
-       0         0      73       0 cdca01651b96 000000000000 000000000000
-       1        73      68       1 f6718a9cb7f3 cdca01651b96 000000000000
-       2       141      68       2 bdd988058d16 cdca01651b96 000000000000
-       3       209      66       3 d8a521142a3c f6718a9cb7f3 bdd988058d16
+     rev linkrev nodeid       p1           p2
+       0       0 cdca01651b96 000000000000 000000000000
+       1       1 f6718a9cb7f3 cdca01651b96 000000000000
+       2       2 bdd988058d16 cdca01651b96 000000000000
+       3       3 d8a521142a3c f6718a9cb7f3 bdd988058d16
 
 log should show foo and quux changed:
 
@@ -97,32 +97,32 @@
 foo: we should have a merge here:
 
   $ hg debugindex foo
-     rev    offset  length linkrev nodeid       p1           p2
-       0         0       3       0 b8e02f643373 000000000000 000000000000
-       1         3       4       1 2ffeddde1b65 b8e02f643373 000000000000
-       2         7       4       2 33d1fb69067a b8e02f643373 000000000000
-       3        11       4       3 aa27919ee430 2ffeddde1b65 33d1fb69067a
+     rev linkrev nodeid       p1           p2
+       0       0 b8e02f643373 000000000000 000000000000
+       1       1 2ffeddde1b65 b8e02f643373 000000000000
+       2       2 33d1fb69067a b8e02f643373 000000000000
+       3       3 aa27919ee430 2ffeddde1b65 33d1fb69067a
 
 bar: we should not have a merge here:
 
   $ hg debugindex bar
-     rev    offset  length linkrev nodeid       p1           p2
-       0         0       3       0 b8e02f643373 000000000000 000000000000
-       1         3       4       2 33d1fb69067a b8e02f643373 000000000000
+     rev linkrev nodeid       p1           p2
+       0       0 b8e02f643373 000000000000 000000000000
+       1       2 33d1fb69067a b8e02f643373 000000000000
 
 baz: we should not have a merge here:
 
   $ hg debugindex baz
-     rev    offset  length linkrev nodeid       p1           p2
-       0         0       3       0 b8e02f643373 000000000000 000000000000
-       1         3       4       1 2ffeddde1b65 b8e02f643373 000000000000
+     rev linkrev nodeid       p1           p2
+       0       0 b8e02f643373 000000000000 000000000000
+       1       1 2ffeddde1b65 b8e02f643373 000000000000
 
 quux: we should not have a merge here:
 
   $ hg debugindex quux
-     rev    offset  length linkrev nodeid       p1           p2
-       0         0       3       0 b8e02f643373 000000000000 000000000000
-       1         3       5       3 6128c0f33108 b8e02f643373 000000000000
+     rev linkrev nodeid       p1           p2
+       0       0 b8e02f643373 000000000000 000000000000
+       1       3 6128c0f33108 b8e02f643373 000000000000
 
 Manifest entries should match tips of all files:
mercurial