equal
deleted
inserted
replaced
128 $ cat dir1/a |
128 $ cat dir1/a |
129 5 |
129 5 |
130 $ cat dir1/b |
130 $ cat dir1/b |
131 6 |
131 6 |
132 $ hg debugindex --dir dir1 |
132 $ hg debugindex --dir dir1 |
133 rev linkrev nodeid p1 p2 |
133 rev linkrev nodeid p1-nodeid p2-nodeid |
134 0 1 8b3ffd73f901 000000000000 000000000000 |
134 0 1 8b3ffd73f901 000000000000 000000000000 |
135 1 2 68e9d057c5a8 8b3ffd73f901 000000000000 |
135 1 2 68e9d057c5a8 8b3ffd73f901 000000000000 |
136 2 4 4698198d2624 68e9d057c5a8 000000000000 |
136 2 4 4698198d2624 68e9d057c5a8 000000000000 |
137 3 5 44844058ccce 68e9d057c5a8 000000000000 |
137 3 5 44844058ccce 68e9d057c5a8 000000000000 |
138 4 6 bf3d9b744927 68e9d057c5a8 000000000000 |
138 4 6 bf3d9b744927 68e9d057c5a8 000000000000 |
274 $ hg diff -r 3 |
274 $ hg diff -r 3 |
275 |
275 |
276 Parent of tree root manifest should be flat manifest, and two for merge |
276 Parent of tree root manifest should be flat manifest, and two for merge |
277 |
277 |
278 $ hg debugindex -m |
278 $ hg debugindex -m |
279 rev linkrev nodeid p1 p2 |
279 rev linkrev nodeid p1-nodeid p2-nodeid |
280 0 0 40536115ed9e 000000000000 000000000000 |
280 0 0 40536115ed9e 000000000000 000000000000 |
281 1 1 f3376063c255 40536115ed9e 000000000000 |
281 1 1 f3376063c255 40536115ed9e 000000000000 |
282 2 2 5d9b9da231a2 40536115ed9e 000000000000 |
282 2 2 5d9b9da231a2 40536115ed9e 000000000000 |
283 3 3 d17d663cbd8a 5d9b9da231a2 f3376063c255 |
283 3 3 d17d663cbd8a 5d9b9da231a2 f3376063c255 |
284 4 4 51e32a8c60ee f3376063c255 000000000000 |
284 4 4 51e32a8c60ee f3376063c255 000000000000 |
294 |
294 |
295 |
295 |
296 Turning off treemanifest config has no effect |
296 Turning off treemanifest config has no effect |
297 |
297 |
298 $ hg debugindex --dir dir1 |
298 $ hg debugindex --dir dir1 |
299 rev linkrev nodeid p1 p2 |
299 rev linkrev nodeid p1-nodeid p2-nodeid |
300 0 4 064927a0648a 000000000000 000000000000 |
300 0 4 064927a0648a 000000000000 000000000000 |
301 1 5 25ecb8cb8618 000000000000 000000000000 |
301 1 5 25ecb8cb8618 000000000000 000000000000 |
302 $ echo 2 > dir1/a |
302 $ echo 2 > dir1/a |
303 $ hg --config experimental.treemanifest=False ci -qm 'modify dir1/a' |
303 $ hg --config experimental.treemanifest=False ci -qm 'modify dir1/a' |
304 $ hg debugindex --dir dir1 |
304 $ hg debugindex --dir dir1 |
305 rev linkrev nodeid p1 p2 |
305 rev linkrev nodeid p1-nodeid p2-nodeid |
306 0 4 064927a0648a 000000000000 000000000000 |
306 0 4 064927a0648a 000000000000 000000000000 |
307 1 5 25ecb8cb8618 000000000000 000000000000 |
307 1 5 25ecb8cb8618 000000000000 000000000000 |
308 2 6 5b16163a30c6 25ecb8cb8618 000000000000 |
308 2 6 5b16163a30c6 25ecb8cb8618 000000000000 |
309 |
309 |
310 Stripping and recovering changes should work |
310 Stripping and recovering changes should work |
313 M dir1/a |
313 M dir1/a |
314 $ hg --config extensions.strip= strip tip |
314 $ hg --config extensions.strip= strip tip |
315 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
315 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
316 saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg |
316 saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/51cfd7b1e13b-78a2f3ed-backup.hg |
317 $ hg debugindex --dir dir1 |
317 $ hg debugindex --dir dir1 |
318 rev linkrev nodeid p1 p2 |
318 rev linkrev nodeid p1-nodeid p2-nodeid |
319 0 4 064927a0648a 000000000000 000000000000 |
319 0 4 064927a0648a 000000000000 000000000000 |
320 1 5 25ecb8cb8618 000000000000 000000000000 |
320 1 5 25ecb8cb8618 000000000000 000000000000 |
321 |
321 |
322 #if repobundlerepo |
322 #if repobundlerepo |
323 $ hg incoming .hg/strip-backup/* |
323 $ hg incoming .hg/strip-backup/* |
340 (run 'hg update' to get a working copy) |
340 (run 'hg update' to get a working copy) |
341 $ hg --config extensions.strip= strip tip |
341 $ hg --config extensions.strip= strip tip |
342 saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob) |
342 saved backup bundle to $TESTTMP/repo-mixed/.hg/strip-backup/*-backup.hg (glob) |
343 $ hg unbundle -q .hg/strip-backup/* |
343 $ hg unbundle -q .hg/strip-backup/* |
344 $ hg debugindex --dir dir1 |
344 $ hg debugindex --dir dir1 |
345 rev linkrev nodeid p1 p2 |
345 rev linkrev nodeid p1-nodeid p2-nodeid |
346 0 4 064927a0648a 000000000000 000000000000 |
346 0 4 064927a0648a 000000000000 000000000000 |
347 1 5 25ecb8cb8618 000000000000 000000000000 |
347 1 5 25ecb8cb8618 000000000000 000000000000 |
348 2 6 5b16163a30c6 25ecb8cb8618 000000000000 |
348 2 6 5b16163a30c6 25ecb8cb8618 000000000000 |
349 $ hg st --change tip |
349 $ hg st --change tip |
350 M dir1/a |
350 M dir1/a |