594 | | |
594 | | |
595 | o 1:73d38bb17fd7@default(draft) add 1 |
595 | o 1:73d38bb17fd7@default(draft) add 1 |
596 |/ |
596 |/ |
597 o 0:8685c6d34325@default(draft) add 0 |
597 o 0:8685c6d34325@default(draft) add 0 |
598 |
598 |
599 $ hg grab -r3 |
599 $ hg pick -r3 |
600 grabbing 3:0e84df4912da "add 3" |
600 picking 3:0e84df4912da "add 3" |
601 $ hg graft -r1 |
601 $ hg graft -r1 |
602 grafting 1:73d38bb17fd7 "add 1" |
602 grafting 1:73d38bb17fd7 "add 1" |
603 $ hg prune -r2 --succ . |
603 $ hg prune -r2 --succ . |
604 1 changesets pruned |
604 1 changesets pruned |
605 $ glog --hidden |
605 $ glog --hidden |
616 | o 1:73d38bb17fd7@default(draft) add 1 |
616 | o 1:73d38bb17fd7@default(draft) add 1 |
617 |/ |
617 |/ |
618 o 0:8685c6d34325@default(draft) add 0 |
618 o 0:8685c6d34325@default(draft) add 0 |
619 |
619 |
620 $ hg debugobsolete |
620 $ hg debugobsolete |
621 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'grab', 'user': 'test'} |
621 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'pick', 'user': 'test'} |
622 db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
622 db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
623 |
623 |
624 Test grab --continue |
624 Test grab --continue |
625 |
625 |
626 $ hg up -qC 0 |
626 $ hg up -qC 0 |
627 $ echo 2 > 1 |
627 $ echo 2 > 1 |
628 $ hg ci -Am conflict 1 |
628 $ hg ci -Am conflict 1 |
629 created new head |
629 created new head |
630 $ hg up -qC 6 |
630 $ hg up -qC 6 |
631 $ hg grab -r 7 |
631 $ hg pick -r 7 |
632 grabbing 7:a5bfd90a2f29 "conflict" |
632 picking 7:a5bfd90a2f29 "conflict" |
633 merging 1 |
633 merging 1 |
634 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') |
634 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') |
635 unresolved merge conflicts (see hg help resolve) |
635 unresolved merge conflicts (see hg help resolve) |
636 [1] |
636 [1] |
637 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
637 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
638 7:a5bfd90a2f29 |
638 7:a5bfd90a2f29 |
639 $ echo 3 > 1 |
639 $ echo 3 > 1 |
640 $ hg resolve -m 1 |
640 $ hg resolve -m 1 |
641 (no more unresolved files) |
641 (no more unresolved files) |
642 continue: hg grab --continue |
642 continue: hg pick --continue |
643 $ hg grab --continue |
643 $ hg pick --continue |
644 $ glog --hidden |
644 $ glog --hidden |
645 @ 8:fb2c0f0a0c54@default(draft) conflict |
645 @ 8:fb2c0f0a0c54@default(draft) conflict |
646 | |
646 | |
647 | x 7:a5bfd90a2f29@default(draft) conflict |
647 | x 7:a5bfd90a2f29@default(draft) conflict |
648 | | |
648 | | |
659 | o 1:73d38bb17fd7@default(draft) add 1 |
659 | o 1:73d38bb17fd7@default(draft) add 1 |
660 |/ |
660 |/ |
661 o 0:8685c6d34325@default(draft) add 0 |
661 o 0:8685c6d34325@default(draft) add 0 |
662 |
662 |
663 $ hg debugobsolete |
663 $ hg debugobsolete |
664 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'grab', 'user': 'test'} |
664 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'pick', 'user': 'test'} |
665 db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
665 db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
666 a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 fb2c0f0a0c54be4367988521bad2cbd33a540969 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'grab', 'user': 'test'} |
666 a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 fb2c0f0a0c54be4367988521bad2cbd33a540969 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'pick', 'user': 'test'} |
667 |
667 |
668 Test touch |
668 Test touch |
669 |
669 |
670 $ glog |
670 $ glog |
671 @ 8:fb2c0f0a0c54@default(draft) conflict |
671 @ 8:fb2c0f0a0c54@default(draft) conflict |