661 8 4de32a90b66c 7 1 8 033544c939f0 |
661 8 4de32a90b66c 7 1 8 033544c939f0 |
662 1 66f7d451a68b 1 1 2 327c7dd73d29 |
662 1 66f7d451a68b 1 1 2 327c7dd73d29 |
663 4 bebd167eb94d 4 1 5 b21465ecb790 |
663 4 bebd167eb94d 4 1 5 b21465ecb790 |
664 6 c8d03c1b5e94 5 1 6 446c2dc3bce5 |
664 6 c8d03c1b5e94 5 1 6 446c2dc3bce5 |
665 7 f69452c5b1af 6 1 7 000000000000 |
665 7 f69452c5b1af 6 1 7 000000000000 |
|
666 |
|
667 Recover after stripping (in the middle of the repo) |
|
668 |
|
669 We strip a branch that is not the tip of the reporiosy so part of the affected |
|
670 revision are reapplied after the target is stripped. |
|
671 |
|
672 $ hg log -G |
|
673 o 8 4de32a90b66c r7 tip |
|
674 | |
|
675 o 7 f69452c5b1af r6 |
|
676 | |
|
677 o 6 c8d03c1b5e94 r5 |
|
678 | |
|
679 | @ 5 45f8b879de92 foo |
|
680 |/ |
|
681 o 4 bebd167eb94d r4 |
|
682 | |
|
683 o 3 2dc09a01254d r3 |
|
684 | |
|
685 o 2 01241442b3c2 r2 |
|
686 | |
|
687 o 1 66f7d451a68b r1 |
|
688 | |
|
689 o 0 1ea73414a91b r0 |
|
690 |
|
691 $ hg --config extensions.strip= strip -r 'desc("foo")' |
|
692 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
693 saved backup bundle to $TESTTMP/client/.hg/strip-backup/45f8b879de92-94c82517-backup.hg (glob) |
|
694 $ hg log -G |
|
695 o 7 4de32a90b66c r7 tip |
|
696 | |
|
697 o 6 f69452c5b1af r6 |
|
698 | |
|
699 o 5 c8d03c1b5e94 r5 |
|
700 | |
|
701 @ 4 bebd167eb94d r4 |
|
702 | |
|
703 o 3 2dc09a01254d r3 |
|
704 | |
|
705 o 2 01241442b3c2 r2 |
|
706 | |
|
707 o 1 66f7d451a68b r1 |
|
708 | |
|
709 o 0 1ea73414a91b r0 |
|
710 |
|
711 $ hg pull |
|
712 pulling from ssh://user@dummy/server |
|
713 searching for changes |
|
714 OBSEXC: looking for common markers in 8 nodes |
|
715 adding changesets |
|
716 adding manifests |
|
717 adding file changes |
|
718 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
719 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
720 $ hg log -G |
|
721 o 8 45f8b879de92 foo tip |
|
722 | |
|
723 | o 7 4de32a90b66c r7 |
|
724 | | |
|
725 | o 6 f69452c5b1af r6 |
|
726 | | |
|
727 | o 5 c8d03c1b5e94 r5 |
|
728 |/ |
|
729 @ 4 bebd167eb94d r4 |
|
730 | |
|
731 o 3 2dc09a01254d r3 |
|
732 | |
|
733 o 2 01241442b3c2 r2 |
|
734 | |
|
735 o 1 66f7d451a68b r1 |
|
736 | |
|
737 o 0 1ea73414a91b r0 |
|
738 |
|
739 $ hg blackbox |
|
740 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' (glob) |
|
741 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> writing .hg/cache/tags2-visible with 0 tags (glob) |
|
742 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' exited 0 after *.?? seconds (glob) |
|
743 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> log -G (glob) |
|
744 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> log -G exited 0 after *.?? seconds (glob) |
|
745 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip -r 'desc("foo")' (glob) |
|
746 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> saved backup bundle to $TESTTMP/client/.hg/strip-backup/45f8b879de92-94c82517-backup.hg (glob) |
|
747 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> strip detected, evo-ext-obshashrange cache reset (glob) |
|
748 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obshashrange in *.???? seconds (5r, 13o) (glob) |
|
749 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> strip detected, evo-ext-obscache cache reset (glob) |
|
750 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (5r, 13o) (glob) |
|
751 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated stablerange cache in *.???? seconds (glob) |
|
752 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obshashrange in *.???? seconds (3r, 0o) (glob) |
|
753 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (3r, 0o) (glob) |
|
754 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated base branch cache in *.???? seconds (glob) |
|
755 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> wrote base branch cache with 1 labels and 1 nodes (glob) |
|
756 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> 3 incoming changes - new heads: 4de32a90b66c (glob) |
|
757 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> --config 'extensions.strip=' strip -r 'desc("foo")' exited 0 after *.?? seconds (glob) |
|
758 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> log -G (glob) |
|
759 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> writing .hg/cache/tags2-visible with 0 tags (glob) |
|
760 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> log -G exited 0 after *.?? seconds (glob) |
|
761 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> pull (glob) |
|
762 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> obsdiscovery, 0/8 mismatch - 1 obshashrange queries in *.???? seconds (glob) |
|
763 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated stablerange cache in *.???? seconds (glob) |
|
764 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obshashrange in *.???? seconds (1r, 0o) (glob) |
|
765 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (1r, 0o) (glob) |
|
766 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated base branch cache in *.???? seconds (glob) |
|
767 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> wrote base branch cache with 1 labels and 2 nodes (glob) |
|
768 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> 1 incoming changes - new heads: 45f8b879de92 (glob) |
|
769 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> pull exited 0 after *.?? seconds (glob) |
|
770 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> log -G (glob) |
|
771 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> writing .hg/cache/tags2-visible with 0 tags (glob) |
|
772 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> log -G exited 0 after *.?? seconds (glob) |
|
773 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> blackbox (glob) |
|
774 $ rm .hg/blackbox.log |
|
775 $ hg debugobshashrange --subranges --rev 'heads(all())' |
|
776 rev node index size depth obshash |
|
777 7 4de32a90b66c 0 8 8 c7f1f7e9925b |
|
778 8 45f8b879de92 0 6 6 b8a4206b0fc6 |
|
779 3 2dc09a01254d 0 4 4 8932bf980bb4 |
|
780 7 4de32a90b66c 4 4 8 c681c3e58c27 |
|
781 3 2dc09a01254d 2 2 4 ce1937ca1278 |
|
782 8 45f8b879de92 4 2 6 31fc49d36a59 |
|
783 7 4de32a90b66c 6 2 8 033544c939f0 |
|
784 1 66f7d451a68b 0 2 2 327c7dd73d29 |
|
785 5 c8d03c1b5e94 4 2 6 89755fd39e6d |
|
786 2 01241442b3c2 2 1 3 1ed3c61fb39a |
|
787 0 1ea73414a91b 0 1 1 000000000000 |
|
788 3 2dc09a01254d 3 1 4 26f996446ecb |
|
789 8 45f8b879de92 5 1 6 1a0c08180b65 |
|
790 7 4de32a90b66c 7 1 8 033544c939f0 |
|
791 1 66f7d451a68b 1 1 2 327c7dd73d29 |
|
792 4 bebd167eb94d 4 1 5 b21465ecb790 |
|
793 5 c8d03c1b5e94 5 1 6 446c2dc3bce5 |
|
794 6 f69452c5b1af 6 1 7 000000000000 |
|
795 |