tests/test-obsolete.t
branchmercurial-4.0
changeset 2596 44dd9d76afb2
parent 2432 765b2561fa90
parent 2595 54ac473663ff
child 2597 22c05418ca71
child 2701 26ec0839865b
equal deleted inserted replaced
2532:ca157d06b2dc 2596:44dd9d76afb2
    33   4538525df7e2b9f09423636c61ef63a4cb872a2d
    33   4538525df7e2b9f09423636c61ef63a4cb872a2d
    34   $ getid 3
    34   $ getid 3
    35   0d3f46688ccc6e756c7e96cf64c391c411309597
    35   0d3f46688ccc6e756c7e96cf64c391c411309597
    36   $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597
    36   $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597
    37   $ hg debugobsolete
    37   $ hg debugobsolete
    38   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
    38   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob)
    39 
    39 
    40 
    40 
    41 Test hidden() revset
    41 Test hidden() revset
    42 
    42 
    43   $ qlog -r 'hidden()' --hidden
    43   $ qlog -r 'hidden()' --hidden
   636      user:        test
   636      user:        test
   637      date:        Thu Jan 01 00:00:00 1970 +0000
   637      date:        Thu Jan 01 00:00:00 1970 +0000
   638      summary:     add a
   638      summary:     add a
   639   
   639   
   640   $ hg debugobsolete | grep -v 33d458d86621f3186c40bfccd77652f4a122743e
   640   $ hg debugobsolete | grep -v 33d458d86621f3186c40bfccd77652f4a122743e
   641   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   641   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob)
   642   0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   642   0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 (*) {'user': 'test'} (glob)
   643   a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   643   a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (*) {'user': 'test'} (glob)
   644   95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   644   95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (*) {'user': 'test'} (glob)
   645   909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   645   909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (*) {'user': 'test'} (glob)
   646   1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   646   1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (*) {'user': 'test'} (glob)
   647   83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   647   83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (*) {'user': 'test'} (glob)
   648   0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 (*) {'user': 'test'} (glob)
   648   0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 (*) {'ef1': '*', 'user': 'test'} (glob)
   649   159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 (*) {'user': 'test'} (glob)
   649   159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 (*) {'ef1': '*', 'user': 'test'} (glob)
   650   9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   650   9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 (*) {'user': 'test'} (glob)
   651   0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'user': 'test'} (glob)
   651   0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'ef1': '*', 'user': 'test'} (glob)
   652 #no produced by 2.3
   652 #no produced by 2.3
   653 33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob)
   653 33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob)
   654 
   654 
   655 Check divergence detection (note: multiple successors is sorted by changeset hash)
   655 Check divergence detection (note: multiple successors is sorted by changeset hash)
   656 
   656 
   688   [4] add obsol_c'
   688   [4] add obsol_c'
   689   [10] add obsol_c
   689   [10] add obsol_c
   690   [2]
   690   [2]
   691   $ hg olog
   691   $ hg olog
   692   @  0d3f46688ccc (3) add obsol_c
   692   @  0d3f46688ccc (3) add obsol_c
   693   |    rewritten by test (*) as 2033b4e49474 (glob)
   693   |    rewritten(parent) by test (*) as 2033b4e49474 (glob)
   694   |    rewritten by test (Thu Jan 01 00:00:00 1970 +0000) as 725c380fe99b
   694   |    rewritten by test (*) as 725c380fe99b (glob)
   695   |
   695   |
   696   x  4538525df7e2 (2) add c
   696   x  4538525df7e2 (2) add c
   697        rewritten by test (Thu Jan 01 00:00:00 1970 +0000) as 0d3f46688ccc
   697        rewritten by test (*) as 0d3f46688ccc (glob)
   698   
   698   
   699 
   699 
   700 Check import reports new unstable changeset:
   700 Check import reports new unstable changeset:
   701 
   701 
   702   $ hg up --hidden 2
   702   $ hg up --hidden 2
   703   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   703   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   704   working directory parent is obsolete! (4538525df7e2)
   704   working directory parent is obsolete! (4538525df7e2)
   705   (4538525df7e2 has diverged, use 'hg evolve -list --divergent' to resolve the issue)
   705   (4538525df7e2 has diverged, use 'hg evolve --list --divergent' to resolve the issue)
   706   $ hg export 9468a5f5d8b2 | hg import -
   706   $ hg export 9468a5f5d8b2 | hg import -
   707   applying patch from stdin
   707   applying patch from stdin
   708   1 new unstable changesets
   708   1 new unstable changesets
   709 
   709 
   710 
   710 
   818   
   818   
   819 
   819 
   820 Simple rewrite
   820 Simple rewrite
   821 
   821 
   822   $ hg  --hidden debugobsolete --rev 3
   822   $ hg  --hidden debugobsolete --rev 3
   823   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   823   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob)
   824 
   824 
   825 simple rewrite with a prune attached to it
   825 simple rewrite with a prune attached to it
   826 
   826 
   827   $ hg debugobsolete --rev 15
   827   $ hg debugobsolete --rev 15
   828   0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'user': 'test'} (glob)
   828   0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'ef1': '*', 'user': 'test'} (glob)
   829   33d458d86621f3186c40bfccd77652f4a122743e 0 {0b1b6dd009c037985363e2290a0b579819f659db} (*) {'user': 'test'} (glob)
   829   33d458d86621f3186c40bfccd77652f4a122743e 0 {0b1b6dd009c037985363e2290a0b579819f659db} (*) {'ef1': '*', 'user': 'test'} (glob)
   830 
   830 
   831 Transitive rewrite
   831 Transitive rewrite
   832 
   832 
   833   $ hg --hidden debugobsolete --rev 8
   833   $ hg --hidden debugobsolete --rev 8
   834   909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   834   909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (*) {'user': 'test'} (glob)
   835   95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   835   95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (*) {'user': 'test'} (glob)
   836   a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
   836   a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (*) {'user': 'test'} (glob)
   837 
   837