522 |
522 |
523 $ hg debug-repair-issue6528 |
523 $ hg debug-repair-issue6528 |
524 no affected revisions were found |
524 no affected revisions were found |
525 |
525 |
526 $ cd .. |
526 $ cd .. |
|
527 |
|
528 A config option can disable the fixing of the bad bundle on the fly |
|
529 ------------------------------------------------------------------- |
|
530 |
|
531 |
|
532 |
|
533 from a v1 bundle |
|
534 ~~~~~~~~~~~~~~~~ |
|
535 |
|
536 $ hg debugbundle --spec "$TESTDIR"/bundles/issue6528.hg-v1 |
|
537 bzip2-v1 |
|
538 |
|
539 $ hg init unbundle-v1-no-fix |
|
540 $ cd unbundle-v1-no-fix |
|
541 |
|
542 $ hg unbundle "$TESTDIR"/bundles/issue6528.hg-v1 --config storage.revlog.issue6528.fix-incoming=no |
|
543 adding changesets |
|
544 adding manifests |
|
545 adding file changes |
|
546 added 8 changesets with 12 changes to 4 files |
|
547 new changesets f5a5a568022f:3beabb508514 (8 drafts) |
|
548 (run 'hg update' to get a working copy) |
|
549 |
|
550 Check that revision were not fixed on the fly |
|
551 |
|
552 $ hg debugrevlogindex b.txt |
|
553 rev linkrev nodeid p1 p2 |
|
554 0 2 05b806ebe5ea 000000000000 000000000000 |
|
555 1 3 a58b36ad6b65 05b806ebe5ea 000000000000 |
|
556 2 6 216a5fe8b8ed 000000000000 000000000000 |
|
557 3 7 ea4f2f2463cc 216a5fe8b8ed 000000000000 |
|
558 |
|
559 $ hg debugrevlogindex D.txt |
|
560 rev linkrev nodeid p1 p2 |
|
561 0 6 2a8d3833f2fb 000000000000 000000000000 |
|
562 1 7 2a80419dfc31 2a8d3833f2fb 000000000000 |
|
563 |
|
564 That we do see the symptoms of the bug |
|
565 |
|
566 $ hg up -- -1 |
|
567 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
568 $ hg status |
|
569 M D.txt (?) |
|
570 M b.txt (?) |
|
571 |
|
572 And that the repair command find issue to fix. |
|
573 |
|
574 $ hg debug-repair-issue6528 --dry-run |
|
575 found affected revision 1 for filelog 'data/D.txt.i' |
|
576 found affected revision 1 for filelog 'data/b.txt.i' |
|
577 found affected revision 3 for filelog 'data/b.txt.i' |
|
578 |
|
579 $ cd .. |
|
580 |
|
581 from a v2 bundle |
|
582 ~~~~~~~~~~~~~~~~ |
|
583 |
|
584 $ hg debugbundle --spec "$TESTDIR"/bundles/issue6528.hg-v2 |
|
585 bzip2-v2 |
|
586 |
|
587 $ hg init unbundle-v2-no-fix |
|
588 $ cd unbundle-v2-no-fix |
|
589 |
|
590 $ hg unbundle "$TESTDIR"/bundles/issue6528.hg-v2 --config storage.revlog.issue6528.fix-incoming=no |
|
591 adding changesets |
|
592 adding manifests |
|
593 adding file changes |
|
594 added 8 changesets with 12 changes to 4 files |
|
595 new changesets f5a5a568022f:3beabb508514 (8 drafts) |
|
596 (run 'hg update' to get a working copy) |
|
597 |
|
598 Check that revision were not fixed on the fly |
|
599 |
|
600 $ hg debugrevlogindex b.txt |
|
601 rev linkrev nodeid p1 p2 |
|
602 0 2 05b806ebe5ea 000000000000 000000000000 |
|
603 1 3 a58b36ad6b65 05b806ebe5ea 000000000000 |
|
604 2 6 216a5fe8b8ed 000000000000 000000000000 |
|
605 3 7 ea4f2f2463cc 216a5fe8b8ed 000000000000 |
|
606 |
|
607 $ hg debugrevlogindex D.txt |
|
608 rev linkrev nodeid p1 p2 |
|
609 0 6 2a8d3833f2fb 000000000000 000000000000 |
|
610 1 7 2a80419dfc31 2a8d3833f2fb 000000000000 |
|
611 |
|
612 That we do see the symptoms of the bug |
|
613 |
|
614 $ hg up -- -1 |
|
615 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
616 $ hg status |
|
617 M D.txt (?) |
|
618 M b.txt (?) |
|
619 |
|
620 And that the repair command find issue to fix. |
|
621 |
|
622 $ hg debug-repair-issue6528 --dry-run |
|
623 found affected revision 1 for filelog 'data/D.txt.i' |
|
624 found affected revision 1 for filelog 'data/b.txt.i' |
|
625 found affected revision 3 for filelog 'data/b.txt.i' |
|
626 |
|
627 $ cd .. |