Mercurial > evolve
view tests/test-obsolete.t @ 5816:a1dad44fe3da
tests: remove some unnecessary config
Some of these tests were originally split from a single file that had (and
used) these options, and some of the tests were later created by just
mindlessly copypasting the same set of options that aren't applicable to the
newly written tests.
Things removed by this patch:
- web section from tests that don't use hg serve and don't push
- phases.publish from tests that don't exchange changesets between repos
- diff section from tests that don't have any diffs
- defaults section that sets the date
The defaults section that only adds -d '0 0' to commands should no longer be
necessary because run-tests.py sets devel.default-date='0 0' since 4.3, and all
command in evolve should respect this config option.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Wed, 03 Mar 2021 10:57:09 +0800 |
parents | 61d2f1cf90f0 |
children | 8e4f6354b316 51ee9809d90d |
line wrap: on
line source
$ . $TESTDIR/testlib/common.sh $ cat >> $HGRCPATH <<EOF > [web] > push_ssl = false > allow_push = * > [phases] > publish=False > [alias] > debugobsolete=debugobsolete -d '0 0' > [extensions] > hgext.rebase= > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ mkcommit() { > echo "$1" > "$1" > hg add "$1" > hg ci -m "add $1" > } $ alias qlog="hg log --template='{rev}\n- {node|short}\n'" $ hg init local $ cd local $ mkcommit a # 0 $ hg phase -p . $ mkcommit b # 1 $ mkcommit c # 2 $ hg up 1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit obsol_c # 3 created new head $ getid 2 4538525df7e2b9f09423636c61ef63a4cb872a2d $ getid 3 0d3f46688ccc6e756c7e96cf64c391c411309597 $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} Test hidden() revset $ qlog -r 'hidden()' --hidden 2 - 4538525df7e2 Test that obsolete changeset are hidden $ qlog 3 - 0d3f46688ccc 1 - 7c3bad9141dc 0 - 1f0dee641bb7 $ qlog --hidden 3 - 0d3f46688ccc 2 - 4538525df7e2 1 - 7c3bad9141dc 0 - 1f0dee641bb7 $ qlog -r 'obsolete()' --hidden 2 - 4538525df7e2 Test that obsolete predecessors are properly computed $ qlog -r 'predecessors(.)' --hidden 2 - 4538525df7e2 $ qlog -r . 3 - 0d3f46688ccc $ hg odiff diff -r 4538525df7e2 -r 0d3f46688ccc c --- a/c Thu Jan 01 00:00:00 1970 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -c diff -r 4538525df7e2 -r 0d3f46688ccc obsol_c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/obsol_c Thu Jan 01 00:00:00 1970 +0000 @@ -0,0 +1,1 @@ +obsol_c Test that obsolete successors are properly computed $ qlog -r 'successors(2)' --hidden 3 - 0d3f46688ccc test obsolete changeset with non-obsolete descendant $ hg up 1 -q $ mkcommit "obsol_c'" # 4 (on 1) created new head $ hg debugobsolete `getid 3` `getid 4` 1 new obsolescence markers obsoleted 1 changesets $ qlog 4 - 725c380fe99b 1 - 7c3bad9141dc 0 - 1f0dee641bb7 $ qlog -r 'obsolete()' --hidden 2 - 4538525df7e2 3 - 0d3f46688ccc $ qlog -r 'allpredecessors(4)' --hidden 2 - 4538525df7e2 3 - 0d3f46688ccc $ qlog -r 'allsuccessors(2)' --hidden 3 - 0d3f46688ccc 4 - 725c380fe99b $ hg up --hidden 3 -q updated to hidden changeset 0d3f46688ccc (hidden revision '0d3f46688ccc' was rewritten as: 725c380fe99b) working directory parent is obsolete! (0d3f46688ccc) (reported by parents too) $ hg parents changeset: 3:0d3f46688ccc parent: 1:7c3bad9141dc user: test date: Thu Jan 01 00:00:00 1970 +0000 obsolete: rewritten as 4:725c380fe99b summary: add obsol_c working directory parent is obsolete! (0d3f46688ccc) (use 'hg evolve' to update to its successor: 725c380fe99b) $ mkcommit d # 5 (on 3) 1 new orphan changesets $ qlog -r 'obsolete()' 3 - 0d3f46688ccc $ qlog -r 'extinct()' --hidden 2 - 4538525df7e2 $ qlog -r 'suspended()' 3 - 0d3f46688ccc $ qlog -r "orphan()" 5 - a7a6f2b5d8a5 Test obsolete keyword $ hg --hidden log -G \ > --template '{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n' @ 5:a7a6f2b5d8a5@default(draft) add d | | o 4:725c380fe99b@default(draft) add obsol_c' | | x | 3:0d3f46688ccc@default(obsolete/draft) add obsol_c |/ | x 2:4538525df7e2@default(obsolete/draft) add c |/ o 1:7c3bad9141dc@default(draft) add b | o 0:1f0dee641bb7@default(public) add a Test communication of obsolete relation with a compatible client $ hg init ../other-new $ hg phase --draft 'secret() - extinct()' # until we fix exclusion abort: empty revision set [10] $ hg push ../other-new pushing to ../other-new searching for changes abort: push includes orphan changeset: a7a6f2b5d8a5! (use 'hg evolve' to get a stable history or --force to ignore warnings) [255] $ hg push -f ../other-new pushing to ../other-new searching for changes adding changesets adding manifests adding file changes added 5 changesets with 5 changes to 5 files (+1 heads) 2 new obsolescence markers 1 new orphan changesets $ hg -R ../other-new verify checking changesets checking manifests crosschecking files in changesets and manifests checking files checked 5 changesets with 5 changes to 5 files $ qlog -R ../other-new -r 'obsolete()' 2 - 0d3f46688ccc $ qlog -R ../other-new 4 - a7a6f2b5d8a5 3 - 725c380fe99b 2 - 0d3f46688ccc 1 - 7c3bad9141dc 0 - 1f0dee641bb7 $ hg up --hidden 3 -q working directory parent is obsolete! (0d3f46688ccc) $ mkcommit obsol_d # 6 1 new orphan changesets created new head $ hg debugobsolete `getid 5` `getid 6` 1 new obsolescence markers obsoleted 1 changesets $ qlog 6 - 95de7fc6918d 4 - 725c380fe99b 3 - 0d3f46688ccc 1 - 7c3bad9141dc 0 - 1f0dee641bb7 $ qlog -r 'obsolete()' 3 - 0d3f46688ccc $ hg push ../other-new pushing to ../other-new searching for changes abort: push includes orphan changeset: 95de7fc6918d! (use 'hg evolve' to get a stable history or --force to ignore warnings) [255] $ hg push ../other-new -f # use f because there is an orphan pushing to ../other-new searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers obsoleted 1 changesets $ qlog -R ../other-new 5 - 95de7fc6918d 3 - 725c380fe99b 2 - 0d3f46688ccc 1 - 7c3bad9141dc 0 - 1f0dee641bb7 $ qlog -R ../other-new -r 'obsolete()' 2 - 0d3f46688ccc Pushing again does not advertise extinct changesets $ hg push ../other-new pushing to ../other-new searching for changes no changes found [1] $ hg up --hidden -q .^ # 3 working directory parent is obsolete! (0d3f46688ccc) $ mkcommit "obsol_d'" # 7 1 new orphan changesets created new head $ hg debugobsolete `getid 6` `getid 7` 1 new obsolescence markers obsoleted 1 changesets $ hg pull -R ../other-new . pulling from . searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers obsoleted 1 changesets new changesets 909a0fb57e5d (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ qlog -R ../other-new 6 - 909a0fb57e5d 3 - 725c380fe99b 2 - 0d3f46688ccc 1 - 7c3bad9141dc 0 - 1f0dee641bb7 pushing to stuff that doesn't support obsolescence DISABLED. the _enable switch is global :-/ .. $ hg init ../other-old .. > # XXX I don't like this but changeset get published otherwise .. > # remove it when we will get a --keep-state flag for push .. $ echo '[extensions]' > ../other-old/.hg/hgrc .. $ echo "obsolete=!$(echo $(dirname $TESTDIR))/obsolete.py" >> ../other-old/.hg/hgrc .. $ hg push ../other-old .. pushing to ../other-old .. searching for changes .. abort: push includes an unstable changeset: 909a0fb57e5d .. (use 'hg evolve' to get a stable history or --force to ignore warnings) .. [255] .. $ hg push -f ../other-old .. pushing to ../other-old .. searching for changes .. adding changesets .. adding manifests .. adding file changes .. added 5 changesets with 5 changes to 5 files (+1 heads) .. $ qlog -R ../other-ol .. 4 .. - 909a0fb57e5d .. 3 .. - 725c380fe99b .. 2 .. - 0d3f46688ccc .. 1 .. - 7c3bad9141dc .. 0 .. - 1f0dee641bb7 clone support $ hg clone . ../cloned > # The warning should go away once we have default value to set ready before we pull updating to branch default 4 files updated, 0 files merged, 0 files removed, 0 files unresolved $ qlog -R ../cloned --hidden 7 - 909a0fb57e5d 6 - 95de7fc6918d 5 - a7a6f2b5d8a5 4 - 725c380fe99b 3 - 0d3f46688ccc 2 - 4538525df7e2 1 - 7c3bad9141dc 0 - 1f0dee641bb7 Test rollback support $ hg up --hidden .^ -q # 3 working directory parent is obsolete! (0d3f46688ccc) $ mkcommit "obsol_d''" 1 new orphan changesets created new head $ hg debugobsolete `getid 7` `getid 8` 1 new obsolescence markers obsoleted 1 changesets $ cd ../other-new $ hg up -q 3 $ hg pull ../local/ pulling from ../local/ searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers obsoleted 1 changesets new changesets 159dfc9fa5d3 (1 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up -q 7 # to check rollback update behavior $ qlog 7 - 159dfc9fa5d3 3 - 725c380fe99b 2 - 0d3f46688ccc 1 - 7c3bad9141dc 0 - 1f0dee641bb7 $ hg rollback repository tip rolled back to revision 6 (undo pull) working directory now based on revision 3 $ hg summary parent: 3:725c380fe99b add obsol_c' branch: default commit: 1 deleted, 2 unknown (clean) update: 2 new changesets, 2 branch heads (merge) phases: 4 draft orphan: 1 changesets $ qlog 6 - 909a0fb57e5d 3 - 725c380fe99b 2 - 0d3f46688ccc 1 - 7c3bad9141dc 0 - 1f0dee641bb7 $ cd ../local obsolete public changeset # move draft boundary from 0 to 1 $ sed -e 's/1f0dee641bb7258c56bd60e93edfa2405381c41e/7c3bad9141dcb46ff89abf5f61856facd56e476c/' -i'.back' .hg/store/phaseroots $ hg up null 0 files updated, 0 files merged, 4 files removed, 0 files unresolved $ mkcommit toto # 9 created new head $ hg id -n 9 $ hg debugobsolete `getid 0` `getid 9` 1 new obsolescence markers 1 new phase-divergent changesets 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7 # at core level the warning is not issued # this is now a big issue now that we have phase divergence warning $ qlog -r 'obsolete()' 3 - 0d3f46688ccc allow to just kill changeset $ qlog 9 - 83b5778897ad 8 - 159dfc9fa5d3 4 - 725c380fe99b 3 - 0d3f46688ccc 1 - 7c3bad9141dc 0 - 1f0dee641bb7 $ hg debugobsolete `getid 9` #kill 1 new obsolescence markers obsoleted 1 changesets $ hg up null -q # to be not based on 9 anymore $ qlog 8 - 159dfc9fa5d3 4 - 725c380fe99b 3 - 0d3f46688ccc 1 - 7c3bad9141dc 0 - 1f0dee641bb7 Check that auto update ignores hidden changeset $ hg up 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg up 3 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to "159dfc9fa5d3: add obsol_d''" 1 other heads for branch "default" $ hg id -n 8 Check that named update does too $ hg update default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg id -n 8 $ hg up null -q # to be not based on 9 anymore check rebase compat $ hg log -G --template='{rev} - {node|short} {desc}\n' * 8 - 159dfc9fa5d3 add obsol_d'' | | o 4 - 725c380fe99b add obsol_c' | | x | 3 - 0d3f46688ccc add obsol_c |/ o 1 - 7c3bad9141dc add b | o 0 - 1f0dee641bb7 add a $ hg log -G --template='{rev} - {node|short} {desc}\n' --hidden x 9 - 83b5778897ad add toto * 8 - 159dfc9fa5d3 add obsol_d'' | | x 7 - 909a0fb57e5d add obsol_d' |/ | x 6 - 95de7fc6918d add obsol_d |/ | x 5 - a7a6f2b5d8a5 add d |/ | o 4 - 725c380fe99b add obsol_c' | | x | 3 - 0d3f46688ccc add obsol_c |/ | x 2 - 4538525df7e2 add c |/ o 1 - 7c3bad9141dc add b | o 0 - 1f0dee641bb7 add a should not rebase extinct changesets $ hg rebase -b '3' -d 4 --traceback note: not rebasing 3:0d3f46688ccc "add obsol_c", already in destination as 4:725c380fe99b "add obsol_c'" rebasing 8:159dfc9fa5d3 "add obsol_d''" $ hg --hidden log -q -r 'successors(min(desc("re:^add obsol_c$")))' 4:725c380fe99b $ hg up tip ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) $ hg log -G --template='{rev} - {node|short} {desc}\n' @ 10 - 8396b69aa9f7 add obsol_d'' | o 4 - 725c380fe99b add obsol_c' | o 1 - 7c3bad9141dc add b | o 0 - 1f0dee641bb7 add a Does not complain about new head if you obsolete the old one (re necessary when we start running discovery on unfiltered repo in core) $ hg push ../other-new --traceback pushing to ../other-new searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers obsoleted 1 changesets $ hg up -q 'desc("re:^add obsol_c'\''$")' $ mkcommit "obsol_d'''" created new head $ hg debugobsolete `getid 'max(desc("re:^add obsol_d'\'\''$"))'` `getid 'desc("re:^add obsol_d'\'\'\''$")'` 1 new obsolescence markers obsoleted 1 changesets $ hg push ../other-new --traceback pushing to ../other-new searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers obsoleted 1 changesets $ cd .. check phase divergence detection (make an obsolete changeset public) $ cd local $ hg phase --hidden --public 'max(desc("re:^add obsol_d'\'\''$"))' 1 new phase-divergent changesets $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n' @ 11 - (draft) 5a9eef7b778b add obsol_d''' | | o 10 - (public) 8396b69aa9f7 add obsol_d'' |/ o 4 - (public) 725c380fe99b add obsol_c' | o 1 - (public) 7c3bad9141dc add b | o 0 - (public) 1f0dee641bb7 add a $ hg log -r 'phasedivergent()' changeset: 11:5a9eef7b778b tag: tip parent: 4:725c380fe99b user: test date: Thu Jan 01 00:00:00 1970 +0000 instability: phase-divergent summary: add obsol_d''' $ hg push ../other-new/ pushing to ../other-new/ searching for changes abort: push includes phase-divergent changeset: 5a9eef7b778b! (use 'hg evolve' to get a stable history or --force to ignore warnings) [255] Check hg commit --amend compat $ hg up 'desc(obsol_c)' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit f created new head $ echo 42 >> f $ hg commit --amend --traceback --quiet $ hg log -G @ changeset: 13:6491691ca36f | tag: tip | parent: 4:725c380fe99b | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: add f | | * changeset: 11:5a9eef7b778b |/ parent: 4:725c380fe99b | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | instability: phase-divergent | summary: add obsol_d''' | | o changeset: 10:8396b69aa9f7 |/ parent: 4:725c380fe99b | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: add obsol_d'' | o changeset: 4:725c380fe99b | parent: 1:7c3bad9141dc | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: add obsol_c' | o changeset: 1:7c3bad9141dc | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: add b | o changeset: 0:1f0dee641bb7 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: add a $ hg debugobsolete | grep -v 33d458d86621f3186c40bfccd77652f4a122743e 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 8396b69aa9f7b4ea03ed94c63641e3c021d71f0c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 8396b69aa9f7b4ea03ed94c63641e3c021d71f0c 5a9eef7b778bf2ba5e6cc1b741ec5a2110ba1480 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} bc294e7f0681bbed7b83047814e9eadabead2f8d 6491691ca36ffa1b1c48d9bf8605ac5a25d200f6 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} Check divergence detection (note: multiple successors is sorted by changeset hash) $ hg up 'max(desc("re:^add obsol_d'\'\''$"))' # add obsol_d'' 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit "obsolet_conflicting_d" $ hg summary parent: 14:553bdab4dee8 tip add obsolet_conflicting_d branch: default commit: (clean) update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) phases: 3 draft phase-divergent: 1 changesets $ hg debugobsolete `getid 'desc("re:^add d$")'` `getid 'desc("re:^add obsolet_conflicting_d$")'` 1 new obsolescence markers 2 new content-divergent changesets $ hg log -r 'contentdivergent()' changeset: 11:5a9eef7b778b parent: 4:725c380fe99b user: test date: Thu Jan 01 00:00:00 1970 +0000 instability: phase-divergent, content-divergent summary: add obsol_d''' changeset: 14:553bdab4dee8 tag: tip parent: 10:8396b69aa9f7 user: test date: Thu Jan 01 00:00:00 1970 +0000 instability: content-divergent summary: add obsolet_conflicting_d Check import reports new unstable changeset: $ hg up --hidden 'desc("re:^add c$")' 1 files updated, 0 files merged, 3 files removed, 0 files unresolved updated to hidden changeset 4538525df7e2 (hidden revision '4538525df7e2' was rewritten as: 725c380fe99b) working directory parent is obsolete! (4538525df7e2) (use 'hg evolve' to update to its successor: 725c380fe99b) $ hg export 'desc("re:^add obsol_d'\'\''$")' | hg import - applying patch from stdin 1 new orphan changesets Relevant marker computation ============================== $ hg log -G --hidden @ changeset: 15:a5f7a21fe7bc | tag: tip | parent: 2:4538525df7e2 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | instability: orphan | summary: add obsol_d'' | | * changeset: 14:553bdab4dee8 | | parent: 10:8396b69aa9f7 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | instability: content-divergent | | summary: add obsolet_conflicting_d | | | | o changeset: 13:6491691ca36f | | | parent: 4:725c380fe99b | | | user: test | | | date: Thu Jan 01 00:00:00 1970 +0000 | | | summary: add f | | | | | | x changeset: 12:bc294e7f0681 | | |/ parent: 4:725c380fe99b | | | user: test | | | date: Thu Jan 01 00:00:00 1970 +0000 | | | obsolete: amended using amend as 13:6491691ca36f | | | summary: add f | | | | | | * changeset: 11:5a9eef7b778b | | |/ parent: 4:725c380fe99b | | | user: test | | | date: Thu Jan 01 00:00:00 1970 +0000 | | | instability: phase-divergent, content-divergent | | | summary: add obsol_d''' | | | | o | changeset: 10:8396b69aa9f7 | |/ parent: 4:725c380fe99b | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | summary: add obsol_d'' | | | | x changeset: 9:83b5778897ad | | parent: -1:000000000000 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | obsolete: pruned | | summary: add toto | | | | x changeset: 8:159dfc9fa5d3 | | | parent: 3:0d3f46688ccc | | | user: test | | | date: Thu Jan 01 00:00:00 1970 +0000 | | | obsolete: rebased using rebase as 10:8396b69aa9f7 | | | summary: add obsol_d'' | | | | | | x changeset: 7:909a0fb57e5d | | |/ parent: 3:0d3f46688ccc | | | user: test | | | date: Thu Jan 01 00:00:00 1970 +0000 | | | obsolete: rewritten as 8:159dfc9fa5d3 | | | summary: add obsol_d' | | | | | | x changeset: 6:95de7fc6918d | | |/ parent: 3:0d3f46688ccc | | | user: test | | | date: Thu Jan 01 00:00:00 1970 +0000 | | | obsolete: rewritten as 7:909a0fb57e5d | | | summary: add obsol_d | | | | | | x changeset: 5:a7a6f2b5d8a5 | | |/ parent: 3:0d3f46688ccc | | | user: test | | | date: Thu Jan 01 00:00:00 1970 +0000 | | | obsolete: rewritten as 6:95de7fc6918d | | | obsolete: rewritten as 14:553bdab4dee8 | | | summary: add d | | | | o | changeset: 4:725c380fe99b | | | parent: 1:7c3bad9141dc | | | user: test | | | date: Thu Jan 01 00:00:00 1970 +0000 | | | summary: add obsol_c' | | | | | x changeset: 3:0d3f46688ccc | |/ parent: 1:7c3bad9141dc | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | obsolete: rewritten as 4:725c380fe99b | | summary: add obsol_c | | x | changeset: 2:4538525df7e2 |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 | obsolete: rewritten as 3:0d3f46688ccc | summary: add c | o changeset: 1:7c3bad9141dc | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: add b | o changeset: 0:1f0dee641bb7 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: add a Simple rewrite $ hg --hidden debugobsolete --rev 'min(desc("re:^add obsol_c$"))' 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} simple rewrite with a prune attached to it $ hg debugobsolete --rev 'desc("re:^add obsolet_conflicting_d$")' a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 553bdab4dee8f0032cd60de38be72d1d2e8225d5 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} Transitive rewrite $ hg --hidden debugobsolete --rev 'min(desc("re:^add obsol_d'\'\''$"))' 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}