Mercurial Mercurial > pub > hg > evolve / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-obsolete.t
branchstable
changeset 1060 f6e0cfca1bf0
parent 1040 640f3280559e
child 1065 f355bbc124fc
equal deleted inserted replaced
1057:168dfc839eca 1060:f6e0cfca1bf0 
     2   > [web]
 
     2   > [web]
 
     3   > push_ssl = false
 
     3   > push_ssl = false
 
     4   > allow_push = *
 
     4   > allow_push = *
 
     5   > [phases]
 
     5   > [phases]
 
     6   > publish=False
 
     6   > publish=False
 
       
     7   > [alias]
 
       
     8   > debugobsolete=debugobsolete -d '0 0'
 
     7   > [extensions]
 
     9   > [extensions]
 
     8   > hgext.rebase=
 
    10   > hgext.rebase=
 
     9   > EOF
 
    11   > EOF
 
    10   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
 
    12   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
 
    11   $ mkcommit() {
 
    13   $ mkcommit() {
 
    32   4538525df7e2b9f09423636c61ef63a4cb872a2d
 
    34   4538525df7e2b9f09423636c61ef63a4cb872a2d
 
    33   $ getid 3
 
    35   $ getid 3
 
    34   0d3f46688ccc6e756c7e96cf64c391c411309597
 
    36   0d3f46688ccc6e756c7e96cf64c391c411309597
 
    35   $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597
 
    37   $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597
 
    36   $ hg debugobsolete
 
    38   $ hg debugobsolete
 
    37   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 {'date': '', 'user': 'test'} (glob)
 
    39   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 {'date': '0 0', 'user': 'test'}
 
    38 
    40 
    39 
    41 
    40 Test hidden() revset
 
    42 Test hidden() revset
 
    41 
    43 
    42   $ qlog -r 'hidden()' --hidden
 
    44   $ qlog -r 'hidden()' --hidden
 
   179   searching for changes
 
   181   searching for changes
 
   180   adding changesets
 
   182   adding changesets
 
   181   adding manifests
 
   183   adding manifests
 
   182   adding file changes
 
   184   adding file changes
 
   183   added 5 changesets with 5 changes to 5 files (+1 heads)
 
   185   added 5 changesets with 5 changes to 5 files (+1 heads)
 
   184   pushing 2 obsolescence markers (123 bytes)
 
   186   pushing 2 obsolescence markers (129 bytes)
 
   185   $ hg -R ../other-new verify
 
   187   $ hg -R ../other-new verify
 
   186   checking changesets
 
   188   checking changesets
 
   187   checking manifests
 
   189   checking manifests
 
   188   crosschecking files in changesets and manifests
 
   190   crosschecking files in changesets and manifests
 
   189   checking files
 
   191   checking files
 
   233   searching for changes
 
   235   searching for changes
 
   234   adding changesets
 
   236   adding changesets
 
   235   adding manifests
 
   237   adding manifests
 
   236   adding file changes
 
   238   adding file changes
 
   237   added 1 changesets with 1 changes to 1 files (+1 heads)
 
   239   added 1 changesets with 1 changes to 1 files (+1 heads)
 
   238   pushing 3 obsolescence markers (184 bytes)
 
   240   pushing 3 obsolescence markers (193 bytes)
 
   239   $ qlog -R ../other-new
 
   241   $ qlog -R ../other-new
 
   240   5
 
   242   5
 
   241   - 95de7fc6918d
 
   243   - 95de7fc6918d
 
   242   3
 
   244   3
 
   243   - 725c380fe99b
 
   245   - 725c380fe99b
 
   255 
   257 
   256   $ hg push ../other-new
 
   258   $ hg push ../other-new
 
   257   pushing to ../other-new
 
   259   pushing to ../other-new
 
   258   searching for changes
 
   260   searching for changes
 
   259   no changes found
 
   261   no changes found
 
   260   pushing 3 obsolescence markers (184 bytes)
 
   262   pushing 3 obsolescence markers (193 bytes)
 
   261   [1]
 
   263   [1]
 
   262 
   264 
   263   $ hg up --hidden -q .^ # 3
 
   265   $ hg up --hidden -q .^ # 3
 
   264   working directory parent is obsolete!
 
   266   working directory parent is obsolete!
 
   265   $ mkcommit "obsol_d'" # 7
 
   267   $ mkcommit "obsol_d'" # 7
 
   534   searching for changes
 
   536   searching for changes
 
   535   adding changesets
 
   537   adding changesets
 
   536   adding manifests
 
   538   adding manifests
 
   537   adding file changes
 
   539   adding file changes
 
   538   added 2 changesets with 1 changes to [12] files (re)
 
   540   added 2 changesets with 1 changes to [12] files (re)
 
   539   pushing 7 obsolescence markers (452 bytes)
 
   541   pushing 7 obsolescence markers (467 bytes)
 
   540   $ hg up -q 10
 
   542   $ hg up -q 10
 
   541   $ mkcommit "obsol_d'''"
 
   543   $ mkcommit "obsol_d'''"
 
   542   created new head
 
   544   created new head
 
   543   $ hg debugobsolete `getid 11` `getid 12`
 
   545   $ hg debugobsolete `getid 11` `getid 12`
 
   544   $ hg push ../other-new --traceback
 
   546   $ hg push ../other-new --traceback
 
   546   searching for changes
 
   548   searching for changes
 
   547   adding changesets
 
   549   adding changesets
 
   548   adding manifests
 
   550   adding manifests
 
   549   adding file changes
 
   551   adding file changes
 
   550   added 1 changesets with 1 changes to 1 files (+1 heads)
 
   552   added 1 changesets with 1 changes to 1 files (+1 heads)
 
   551   pushing 8 obsolescence markers (513 bytes)
 
   553   pushing 8 obsolescence markers (531 bytes)
 
   552   $ cd ..
 
   554   $ cd ..
 
   553 
   555 
   554 check bumped detection
 
   556 check bumped detection
 
   555 (make an obsolete changeset public)
 
   557 (make an obsolete changeset public)
 
   556 
   558 
   633      user:        test
 
   635      user:        test
 
   634      date:        Thu Jan 01 00:00:00 1970 +0000
 
   636      date:        Thu Jan 01 00:00:00 1970 +0000
 
   635      summary:     add a
 
   637      summary:     add a
 
   636   
   638   
   637   $ hg debugobsolete | grep -v 33d458d86621f3186c40bfccd77652f4a122743e
 
   639   $ hg debugobsolete | grep -v 33d458d86621f3186c40bfccd77652f4a122743e
 
   638   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 {'date': '', 'user': 'test'} (glob)
 
   640   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 {'date': '0 0', 'user': 'test'}
 
   639   0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 {'date': '', 'user': 'test'} (glob)
 
   641   0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 {'date': '0 0', 'user': 'test'}
 
   640   a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 {'date': '', 'user': 'test'} (glob)
 
   642   a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 {'date': '0 0', 'user': 'test'}
 
   641   95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 {'date': '', 'user': 'test'} (glob)
 
   643   95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 {'date': '0 0', 'user': 'test'}
 
   642   909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 {'date': '', 'user': 'test'} (glob)
 
   644   909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 {'date': '0 0', 'user': 'test'}
 
   643   1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 {'date': '', 'user': 'test'} (glob)
 
   645   1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 {'date': '0 0', 'user': 'test'}
 
   644   83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 {'date': '', 'user': 'test'} (glob)
 
   646   83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 {'date': '0 0', 'user': 'test'}
 
   645   0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 {'date': '* *', 'user': 'test'} (glob)
 
   647   0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 {'date': '* *', 'user': 'test'} (glob)
 
   646   159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 {'date': '* *', 'user': 'test'} (glob)
 
   648   159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 {'date': '* *', 'user': 'test'} (glob)
 
   647   9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 {'date': '', 'user': 'test'} (glob)
 
   649   9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 {'date': '0 0', 'user': 'test'}
 
   648   0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 {'date': '* *', 'user': 'test'} (glob)
 
   650   0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 {'date': '* *', 'user': 'test'} (glob)
 
   649 #no produced by 2.3
 
   651 #no produced by 2.3
 
   650 33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob)
 
   652 33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob)
 
   651 
   653 
   652 Check divergence detection
 
   654 Check divergence detection
 
   811   
   813   
   812 
   814 
   813 Simple rewrite
 
   815 Simple rewrite
 
   814 
   816 
   815   $ hg  --hidden debugobsoleterelevant 3
 
   817   $ hg  --hidden debugobsoleterelevant 3
 
   816   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 {'date': '', 'user': 'test'}
 
   818   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 {'date': '0 0', 'user': 'test'}
 
   817 
   819 
   818 simple rewrite with a prune attached to it
 
   820 simple rewrite with a prune attached to it
 
   819 
   821 
   820   $ hg debugobsoleterelevant 15
 
   822   $ hg debugobsoleterelevant 15
 
   821   0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 {'date': '* *', 'user': 'test'} (glob)
 
   823   0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 {'date': '* *', 'user': 'test'} (glob)
 
   822   33d458d86621f3186c40bfccd77652f4a122743e 0 {'date': '* *', 'p1': '0b1b6dd009c037985363e2290a0b579819f659db', 'user': 'test'} (glob)
 
   824   33d458d86621f3186c40bfccd77652f4a122743e 0 {'date': '* *', 'p1': '0b1b6dd009c037985363e2290a0b579819f659db', 'user': 'test'} (glob)
 
   823 
   825 
   824 Transitive rewrite
 
   826 Transitive rewrite
 
   825 
   827 
   826   $ hg --hidden debugobsoleterelevant 8
 
   828   $ hg --hidden debugobsoleterelevant 8
 
   827   909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 {'date': '', 'user': 'test'}
 
   829   909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 {'date': '0 0', 'user': 'test'}
 
   828   95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 {'date': '', 'user': 'test'}
 
   830   95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 {'date': '0 0', 'user': 'test'}
 
   829   a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 {'date': '', 'user': 'test'}
 
   831   a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 {'date': '0 0', 'user': 'test'}
 
   830 
   832
evolve