equal
deleted
inserted
replaced
11 > [alias] |
11 > [alias] |
12 > qlog = log --template='{rev} - {node|short} {desc} ({phase})\n' |
12 > qlog = log --template='{rev} - {node|short} {desc} ({phase})\n' |
13 > [diff] |
13 > [diff] |
14 > git = 1 |
14 > git = 1 |
15 > unified = 0 |
15 > unified = 0 |
|
16 > [experimental] |
|
17 > evolution.effect-flags = yes |
16 > [extensions] |
18 > [extensions] |
17 > hgext.graphlog= |
19 > hgext.graphlog= |
18 > EOF |
20 > EOF |
19 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
21 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
20 $ mkcommit() { |
22 $ mkcommit() { |
334 | x 1:568a468b60fc@default(draft) a nifty feature |
336 | x 1:568a468b60fc@default(draft) a nifty feature |
335 |/ |
337 |/ |
336 @ 0:e55e0562ee93@default(public) base |
338 @ 0:e55e0562ee93@default(public) base |
337 |
339 |
338 $ hg debugobsolete |
340 $ hg debugobsolete |
339 73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (*) {'user': 'test'} (glob) |
341 73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
340 c97947cdc7a2a11cf78419f5c2c3dd3944ec79e8 0 {73296a82292a76fb8a7061969d2489ec0d84cd5e} (*) {'user': 'test'} (glob) |
342 c97947cdc7a2a11cf78419f5c2c3dd3944ec79e8 0 {73296a82292a76fb8a7061969d2489ec0d84cd5e} (*) {'ef1': '0', 'user': 'test'} (glob) |
341 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (*) {'user': 'test'} (glob) |
343 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
342 c296b79833d1d497f33144786174bf35e04e44a3 0 {568a468b60fc99a42d5d4ddbe181caff1eef308d} (*) {'user': 'test'} (glob) |
344 c296b79833d1d497f33144786174bf35e04e44a3 0 {568a468b60fc99a42d5d4ddbe181caff1eef308d} (*) {'ef1': '0', 'user': 'test'} (glob) |
343 $ hg evolve |
345 $ hg evolve |
344 move:[4] another feature (child of 568a468b60fc) |
346 move:[4] another feature (child of 568a468b60fc) |
345 atop:[6] a nifty feature |
347 atop:[6] a nifty feature |
346 merging main-file-1 |
348 merging main-file-1 |
347 working directory is now at 99833d22b0c6 |
349 working directory is now at 99833d22b0c6 |
587 | o 1:73d38bb17fd7@default(draft) add 1 |
589 | o 1:73d38bb17fd7@default(draft) add 1 |
588 |/ |
590 |/ |
589 o 0:8685c6d34325@default(draft) add 0 |
591 o 0:8685c6d34325@default(draft) add 0 |
590 |
592 |
591 $ hg debugobsolete |
593 $ hg debugobsolete |
592 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (*) {'user': 'test'} (glob) |
594 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (*) {'ef1': '4', 'user': 'test'} (glob) |
593 db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (*) {'user': 'test'} (glob) |
595 db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (*) {'ef1': '13', 'user': 'test'} (glob) |
594 |
596 |
595 Test graft --continue |
597 Test graft --continue |
596 |
598 |
597 $ hg up -qC 0 |
599 $ hg up -qC 0 |
598 $ echo 2 > 1 |
600 $ echo 2 > 1 |
632 | o 1:73d38bb17fd7@default(draft) add 1 |
634 | o 1:73d38bb17fd7@default(draft) add 1 |
633 |/ |
635 |/ |
634 o 0:8685c6d34325@default(draft) add 0 |
636 o 0:8685c6d34325@default(draft) add 0 |
635 |
637 |
636 $ hg debugobsolete |
638 $ hg debugobsolete |
637 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (*) {'user': 'test'} (glob) |
639 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (*) {'ef1': '4', 'user': 'test'} (glob) |
638 db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (*) {'user': 'test'} (glob) |
640 db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (*) {'ef1': '13', 'user': 'test'} (glob) |
639 a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 920e58bb443b73eea9d6d65570b4241051ea3229 0 (*) {'user': 'test'} (glob) |
641 a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 920e58bb443b73eea9d6d65570b4241051ea3229 0 (*) {'ef1': '12', 'user': 'test'} (glob) |
640 |
642 |
641 Test touch |
643 Test touch |
642 |
644 |
643 $ glog |
645 $ glog |
644 @ 8:920e58bb443b@default(draft) conflict |
646 @ 8:920e58bb443b@default(draft) conflict |
772 |
774 |
773 $ hg olog | head -n 10 # hg touch makes the output unstable (fix it with devel option for more stable touch) |
775 $ hg olog | head -n 10 # hg touch makes the output unstable (fix it with devel option for more stable touch) |
774 @ d26d339c513f (12) add 4 |
776 @ d26d339c513f (12) add 4 |
775 |\ |
777 |\ |
776 x | af636757ce3b (11) add 3 |
778 x | af636757ce3b (11) add 3 |
777 |\ \ rewritten by test (*) as d26d339c513f (glob) |
779 |\ \ rewritten(description, user, parent, content) by test (*) as d26d339c513f (glob) |
778 | | | |
780 | | | |
779 | \ \ |
781 | \ \ |
780 | |\ \ |
782 | |\ \ |
781 | | | x ce341209337f (4) add 4 |
783 | | | x ce341209337f (4) add 4 |
782 | | | rewritten by test (*) as d26d339c513f (glob) |
784 | | | rewritten(description, user, content) by test (*) as d26d339c513f (glob) |
783 | | | |
785 | | | |
784 |
786 |
785 Test obsstore stat |
787 Test obsstore stat |
786 |
788 |
787 $ hg debugobsstorestat |
789 $ hg debugobsstorestat |
791 markers with no successors: 0 |
793 markers with no successors: 0 |
792 1 successors: 10 |
794 1 successors: 10 |
793 2 successors: 0 |
795 2 successors: 0 |
794 more than 2 successors: 0 |
796 more than 2 successors: 0 |
795 available keys: |
797 available keys: |
|
798 ef1: 10 |
796 user: 10 |
799 user: 10 |
797 marker size: |
800 marker size: |
798 format v1: |
801 format v1: |
799 smallest length: 69 |
802 smallest length: 75 |
800 longer length: 69 |
803 longer length: 76 |
801 median length: 69 |
804 median length: 76 |
802 mean length: 69 |
805 mean length: 75 |
803 format v0: |
806 format v0: |
804 smallest length: * (glob) |
807 smallest length: * (glob) |
805 longer length: * (glob) |
808 longer length: * (glob) |
806 median length: * (glob) |
809 median length: * (glob) |
807 mean length: * (glob) |
810 mean length: * (glob) |