equal
deleted
inserted
replaced
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 |
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 |