Mercurial > evolve
comparison tests/test-obsolete.t @ 2594:a3fbe5293bf6 stable
merge with stable
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Fri, 16 Jun 2017 11:32:21 +0200 |
parents | cbc7a69116bd |
children | 54ac473663ff 6e5f5de46c50 |
comparison
equal
deleted
inserted
replaced
2557:e3acb8823900 | 2594:a3fbe5293bf6 |
---|---|
32 4538525df7e2b9f09423636c61ef63a4cb872a2d | 32 4538525df7e2b9f09423636c61ef63a4cb872a2d |
33 $ getid 3 | 33 $ getid 3 |
34 0d3f46688ccc6e756c7e96cf64c391c411309597 | 34 0d3f46688ccc6e756c7e96cf64c391c411309597 |
35 $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 | 35 $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 |
36 $ hg debugobsolete | 36 $ hg debugobsolete |
37 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 37 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob) |
38 | 38 |
39 | 39 |
40 Test hidden() revset | 40 Test hidden() revset |
41 | 41 |
42 $ qlog -r 'hidden()' --hidden | 42 $ qlog -r 'hidden()' --hidden |
637 user: test | 637 user: test |
638 date: Thu Jan 01 00:00:00 1970 +0000 | 638 date: Thu Jan 01 00:00:00 1970 +0000 |
639 summary: add a | 639 summary: add a |
640 | 640 |
641 $ hg debugobsolete | grep -v 33d458d86621f3186c40bfccd77652f4a122743e | 641 $ hg debugobsolete | grep -v 33d458d86621f3186c40bfccd77652f4a122743e |
642 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 642 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob) |
643 0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 643 0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 (*) {'user': 'test'} (glob) |
644 a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 644 a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (*) {'user': 'test'} (glob) |
645 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 645 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (*) {'user': 'test'} (glob) |
646 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 646 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (*) {'user': 'test'} (glob) |
647 1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 647 1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (*) {'user': 'test'} (glob) |
648 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 648 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (*) {'user': 'test'} (glob) |
649 0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 (*) {'user': 'test'} (glob) | 649 0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
650 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 (*) {'user': 'test'} (glob) | 650 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
651 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 651 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 (*) {'user': 'test'} (glob) |
652 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'user': 'test'} (glob) | 652 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
653 #no produced by 2.3 | 653 #no produced by 2.3 |
654 33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob) | 654 33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob) |
655 | 655 |
656 Check divergence detection (note: multiple successors is sorted by changeset hash) | 656 Check divergence detection (note: multiple successors is sorted by changeset hash) |
657 | 657 |
691 [4] add obsol_c' | 691 [4] add obsol_c' |
692 [10] add obsol_c | 692 [10] add obsol_c |
693 [2] | 693 [2] |
694 $ hg olog | 694 $ hg olog |
695 @ 0d3f46688ccc (3) add obsol_c | 695 @ 0d3f46688ccc (3) add obsol_c |
696 | rewritten by test (*) as 2033b4e49474 (glob) | 696 | rewritten(parent) by test (*) as 2033b4e49474 (glob) |
697 | rewritten by test (Thu Jan 01 00:00:00 1970 +0000) as 725c380fe99b | 697 | rewritten by test (*) as 725c380fe99b (glob) |
698 | | 698 | |
699 x 4538525df7e2 (2) add c | 699 x 4538525df7e2 (2) add c |
700 rewritten by test (Thu Jan 01 00:00:00 1970 +0000) as 0d3f46688ccc | 700 rewritten by test (*) as 0d3f46688ccc (glob) |
701 | 701 |
702 | 702 |
703 Check import reports new unstable changeset: | 703 Check import reports new unstable changeset: |
704 | 704 |
705 $ hg up --hidden 2 | 705 $ hg up --hidden 2 |
824 | 824 |
825 | 825 |
826 Simple rewrite | 826 Simple rewrite |
827 | 827 |
828 $ hg --hidden debugobsolete --rev 3 | 828 $ hg --hidden debugobsolete --rev 3 |
829 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 829 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob) |
830 | 830 |
831 simple rewrite with a prune attached to it | 831 simple rewrite with a prune attached to it |
832 | 832 |
833 $ hg debugobsolete --rev 15 | 833 $ hg debugobsolete --rev 15 |
834 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'user': 'test'} (glob) | 834 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
835 33d458d86621f3186c40bfccd77652f4a122743e 0 {0b1b6dd009c037985363e2290a0b579819f659db} (*) {'user': 'test'} (glob) | 835 33d458d86621f3186c40bfccd77652f4a122743e 0 {0b1b6dd009c037985363e2290a0b579819f659db} (*) {'ef1': '*', 'user': 'test'} (glob) |
836 | 836 |
837 Transitive rewrite | 837 Transitive rewrite |
838 | 838 |
839 $ hg --hidden debugobsolete --rev 8 | 839 $ hg --hidden debugobsolete --rev 8 |
840 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 840 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (*) {'user': 'test'} (glob) |
841 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 841 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (*) {'user': 'test'} (glob) |
842 a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 842 a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (*) {'user': 'test'} (glob) |
843 | 843 |