equal
deleted
inserted
replaced
334 | x 1:568a468b60fc@default(draft) a nifty feature |
334 | x 1:568a468b60fc@default(draft) a nifty feature |
335 |/ |
335 |/ |
336 @ 0:e55e0562ee93@default(public) base |
336 @ 0:e55e0562ee93@default(public) base |
337 |
337 |
338 $ hg debugobsolete |
338 $ hg debugobsolete |
339 73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (*) {'user': 'test'} (glob) |
339 73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
340 c97947cdc7a2a11cf78419f5c2c3dd3944ec79e8 0 {73296a82292a76fb8a7061969d2489ec0d84cd5e} (*) {'user': 'test'} (glob) |
340 c97947cdc7a2a11cf78419f5c2c3dd3944ec79e8 0 {73296a82292a76fb8a7061969d2489ec0d84cd5e} (*) {'ef1': '0', 'user': 'test'} (glob) |
341 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (*) {'user': 'test'} (glob) |
341 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
342 c296b79833d1d497f33144786174bf35e04e44a3 0 {568a468b60fc99a42d5d4ddbe181caff1eef308d} (*) {'user': 'test'} (glob) |
342 c296b79833d1d497f33144786174bf35e04e44a3 0 {568a468b60fc99a42d5d4ddbe181caff1eef308d} (*) {'ef1': '0', 'user': 'test'} (glob) |
343 $ hg evolve |
343 $ hg evolve |
344 move:[4] another feature (child of 568a468b60fc) |
344 move:[4] another feature (child of 568a468b60fc) |
345 atop:[6] a nifty feature |
345 atop:[6] a nifty feature |
346 merging main-file-1 |
346 merging main-file-1 |
347 working directory is now at 99833d22b0c6 |
347 working directory is now at 99833d22b0c6 |
517 checking files |
517 checking files |
518 3 files, 4 changesets, 4 total revisions |
518 3 files, 4 changesets, 4 total revisions |
519 $ hg --config extensions.hgext.mq= strip 'extinct()' |
519 $ hg --config extensions.hgext.mq= strip 'extinct()' |
520 abort: empty revision set |
520 abort: empty revision set |
521 [255] |
521 [255] |
522 $ hg --config extensions.hgext.mq= strip --hidden 'extinct()' |
522 (do some garbare collection) |
|
523 $ hg --config extensions.hgext.mq= strip --hidden 'extinct()' --config devel.strip-obsmarkers=no |
523 saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-d7bd82e9-backup.hg (glob) |
524 saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-d7bd82e9-backup.hg (glob) |
524 $ hg verify |
525 $ hg verify |
525 checking changesets |
526 checking changesets |
526 checking manifests |
527 checking manifests |
527 crosschecking files in changesets and manifests |
528 crosschecking files in changesets and manifests |
586 | o 1:73d38bb17fd7@default(draft) add 1 |
587 | o 1:73d38bb17fd7@default(draft) add 1 |
587 |/ |
588 |/ |
588 o 0:8685c6d34325@default(draft) add 0 |
589 o 0:8685c6d34325@default(draft) add 0 |
589 |
590 |
590 $ hg debugobsolete |
591 $ hg debugobsolete |
591 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (*) {'user': 'test'} (glob) |
592 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (*) {'ef1': '4', 'user': 'test'} (glob) |
592 db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (*) {'user': 'test'} (glob) |
593 db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (*) {'ef1': '13', 'user': 'test'} (glob) |
593 |
594 |
594 Test graft --continue |
595 Test graft --continue |
595 |
596 |
596 $ hg up -qC 0 |
597 $ hg up -qC 0 |
597 $ echo 2 > 1 |
598 $ echo 2 > 1 |
631 | o 1:73d38bb17fd7@default(draft) add 1 |
632 | o 1:73d38bb17fd7@default(draft) add 1 |
632 |/ |
633 |/ |
633 o 0:8685c6d34325@default(draft) add 0 |
634 o 0:8685c6d34325@default(draft) add 0 |
634 |
635 |
635 $ hg debugobsolete |
636 $ hg debugobsolete |
636 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (*) {'user': 'test'} (glob) |
637 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (*) {'ef1': '4', 'user': 'test'} (glob) |
637 db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (*) {'user': 'test'} (glob) |
638 db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (*) {'ef1': '13', 'user': 'test'} (glob) |
638 a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 920e58bb443b73eea9d6d65570b4241051ea3229 0 (*) {'user': 'test'} (glob) |
639 a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 920e58bb443b73eea9d6d65570b4241051ea3229 0 (*) {'ef1': '12', 'user': 'test'} (glob) |
639 |
640 |
640 Test touch |
641 Test touch |
641 |
642 |
642 $ glog |
643 $ glog |
643 @ 8:920e58bb443b@default(draft) conflict |
644 @ 8:920e58bb443b@default(draft) conflict |
769 |
770 |
770 Test obsstore stat |
771 Test obsstore stat |
771 |
772 |
772 $ hg debugobsstorestat |
773 $ hg debugobsstorestat |
773 markers total: 10 |
774 markers total: 10 |
774 for known precursors: 10 |
775 for known precursors: 10 (10/13 obsolete changesets) |
775 with parents data: 0 |
776 with parents data: 0 |
776 markers with no successors: 0 |
777 markers with no successors: 0 |
777 1 successors: 10 |
778 1 successors: 10 |
778 2 successors: 0 |
779 2 successors: 0 |
779 more than 2 successors: 0 |
780 more than 2 successors: 0 |
780 available keys: |
781 available keys: |
|
782 ef1: 10 |
781 user: 10 |
783 user: 10 |
782 marker size: |
784 marker size: |
783 format v1: |
785 format v1: |
784 smallest length: 69 |
786 smallest length: 75 |
785 longer length: 69 |
787 longer length: 76 |
786 median length: 69 |
788 median length: 76 |
787 mean length: 69 |
789 mean length: 75 |
788 format v0: |
790 format v0: |
789 smallest length: * (glob) |
791 smallest length: * (glob) |
790 longer length: * (glob) |
792 longer length: * (glob) |
791 median length: * (glob) |
793 median length: * (glob) |
792 mean length: * (glob) |
794 mean length: * (glob) |