97 |
97 |
98 |
98 |
99 |
99 |
100 foo: we should have a merge here: |
100 foo: we should have a merge here: |
101 |
101 |
102 $ hg debugindex .hg/store/data/foo.i |
102 $ hg debugindex foo |
103 rev offset length base linkrev nodeid p1 p2 |
103 rev offset length base linkrev nodeid p1 p2 |
104 0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
104 0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
105 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 |
105 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 |
106 2 7 4 2 2 33d1fb69067a b8e02f643373 000000000000 |
106 2 7 4 2 2 33d1fb69067a b8e02f643373 000000000000 |
107 3 11 4 3 3 aa27919ee430 2ffeddde1b65 33d1fb69067a |
107 3 11 4 3 3 aa27919ee430 2ffeddde1b65 33d1fb69067a |
108 |
108 |
109 bar: we should not have a merge here: |
109 bar: we should not have a merge here: |
110 |
110 |
111 $ hg debugindex .hg/store/data/bar.i |
111 $ hg debugindex bar |
112 rev offset length base linkrev nodeid p1 p2 |
112 rev offset length base linkrev nodeid p1 p2 |
113 0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
113 0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
114 1 3 4 1 2 33d1fb69067a b8e02f643373 000000000000 |
114 1 3 4 1 2 33d1fb69067a b8e02f643373 000000000000 |
115 |
115 |
116 baz: we should not have a merge here: |
116 baz: we should not have a merge here: |
117 |
117 |
118 $ hg debugindex .hg/store/data/baz.i |
118 $ hg debugindex baz |
119 rev offset length base linkrev nodeid p1 p2 |
119 rev offset length base linkrev nodeid p1 p2 |
120 0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
120 0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
121 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 |
121 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000 |
122 |
122 |
123 quux: we should not have a merge here: |
123 quux: we should not have a merge here: |
124 |
124 |
125 $ hg debugindex .hg/store/data/quux.i |
125 $ hg debugindex quux |
126 rev offset length base linkrev nodeid p1 p2 |
126 rev offset length base linkrev nodeid p1 p2 |
127 0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
127 0 0 3 0 0 b8e02f643373 000000000000 000000000000 |
128 1 3 5 1 3 6128c0f33108 b8e02f643373 000000000000 |
128 1 3 5 1 3 6128c0f33108 b8e02f643373 000000000000 |
129 |
129 |
130 Manifest entries should match tips of all files: |
130 Manifest entries should match tips of all files: |