Show More
@@ -1,3 +1,7 b'' | |||||
|
1 | $ cat << EOF >> $HGRCPATH | |||
|
2 | > [format] | |||
|
3 | > usegeneraldelta=yes | |||
|
4 | > EOF | |||
1 |
|
5 | |||
2 |
|
|
6 | Set up repo | |
3 |
|
7 | |||
@@ -118,13 +122,13 b' Merge creates 2-parent revision of direc' | |||||
118 | $ cat dir1/b |
|
122 | $ cat dir1/b | |
119 | 6 |
|
123 | 6 | |
120 | $ hg debugindex --dir dir1 |
|
124 | $ hg debugindex --dir dir1 | |
121 |
rev offset length |
|
125 | rev offset length delta linkrev nodeid p1 p2 | |
122 |
0 0 54 |
|
126 | 0 0 54 -1 1 8b3ffd73f901 000000000000 000000000000 | |
123 | 1 54 68 0 2 b66d046c644f 8b3ffd73f901 000000000000 |
|
127 | 1 54 68 0 2 b66d046c644f 8b3ffd73f901 000000000000 | |
124 |
2 122 12 |
|
128 | 2 122 12 1 4 b87265673c8a b66d046c644f 000000000000 | |
125 |
3 134 |
|
129 | 3 134 55 1 5 aa5d3adcec72 b66d046c644f 000000000000 | |
126 |
4 |
|
130 | 4 189 55 1 6 e29b066b91ad b66d046c644f 000000000000 | |
127 |
5 |
|
131 | 5 244 55 4 7 a120ce2b83f5 e29b066b91ad aa5d3adcec72 | |
128 |
|
132 | |||
129 | Merge keeping directory from parent 1 does not create revlog entry. (Note that |
|
133 | Merge keeping directory from parent 1 does not create revlog entry. (Note that | |
130 | dir1's manifest does change, but only because dir1/a's filelog changes.) |
|
134 | dir1's manifest does change, but only because dir1/a's filelog changes.) | |
@@ -250,13 +254,13 b' Merge of two trees' | |||||
250 | Parent of tree root manifest should be flat manifest, and two for merge |
|
254 | Parent of tree root manifest should be flat manifest, and two for merge | |
251 |
|
255 | |||
252 | $ hg debugindex -m |
|
256 | $ hg debugindex -m | |
253 |
rev offset length |
|
257 | rev offset length delta linkrev nodeid p1 p2 | |
254 |
0 0 80 |
|
258 | 0 0 80 -1 0 40536115ed9e 000000000000 000000000000 | |
255 | 1 80 83 0 1 f3376063c255 40536115ed9e 000000000000 |
|
259 | 1 80 83 0 1 f3376063c255 40536115ed9e 000000000000 | |
256 |
2 163 |
|
260 | 2 163 89 0 2 5d9b9da231a2 40536115ed9e 000000000000 | |
257 |
3 2 |
|
261 | 3 252 83 2 3 d17d663cbd8a 5d9b9da231a2 f3376063c255 | |
258 |
4 3 |
|
262 | 4 335 124 1 4 c05a51345f86 f3376063c255 000000000000 | |
259 |
5 4 |
|
263 | 5 459 124 2 5 82594b1f557d 5d9b9da231a2 f3376063c255 | |
260 |
|
264 | |||
261 |
|
265 | |||
262 | Status across flat/tree boundary should work |
|
266 | Status across flat/tree boundary should work | |
@@ -270,16 +274,16 b' Status across flat/tree boundary should ' | |||||
270 | Turning off treemanifest config has no effect |
|
274 | Turning off treemanifest config has no effect | |
271 |
|
275 | |||
272 | $ hg debugindex .hg/store/meta/dir1/00manifest.i |
|
276 | $ hg debugindex .hg/store/meta/dir1/00manifest.i | |
273 |
rev offset length |
|
277 | rev offset length delta linkrev nodeid p1 p2 | |
274 |
0 0 125 |
|
278 | 0 0 125 -1 4 63c9c0557d24 000000000000 000000000000 | |
275 |
1 125 1 |
|
279 | 1 125 131 -1 5 23d12a1f6e0e 000000000000 000000000000 | |
276 | $ echo 2 > dir1/a |
|
280 | $ echo 2 > dir1/a | |
277 | $ hg --config experimental.treemanifest=False ci -qm 'modify dir1/a' |
|
281 | $ hg --config experimental.treemanifest=False ci -qm 'modify dir1/a' | |
278 | $ hg debugindex .hg/store/meta/dir1/00manifest.i |
|
282 | $ hg debugindex .hg/store/meta/dir1/00manifest.i | |
279 |
rev offset length |
|
283 | rev offset length delta linkrev nodeid p1 p2 | |
280 |
0 0 125 |
|
284 | 0 0 125 -1 4 63c9c0557d24 000000000000 000000000000 | |
281 |
1 125 1 |
|
285 | 1 125 131 -1 5 23d12a1f6e0e 000000000000 000000000000 | |
282 |
2 2 |
|
286 | 2 256 55 1 6 3cb2d87b4250 23d12a1f6e0e 000000000000 | |
283 |
|
287 | |||
284 | Create deeper repo with tree manifests. |
|
288 | Create deeper repo with tree manifests. | |
285 |
|
289 |
General Comments 0
You need to be logged in to leave comments.
Login now