evolve: comparison tests/test-obsolete.t

equal deleted inserted replaced

-:5ca297e78f2c
+:f8677cb11dcb
 $ hg parents
 changeset:   3:0d3f46688ccc
 parent:      1:7c3bad9141dc
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
-obsolete:    rewritten as 4:725c380fe99b
+obsolete:    rewritten as 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
+1 new unstable changesets
 $ qlog -r 'obsolete()'
 3
 - 0d3f46688ccc
 $ qlog -r 'extinct()' --hidden
 abort: empty revision set
 [255]
 $ hg push ../other-new
 pushing to ../other-new
 searching for changes
-abort: push includes orphan changeset: a7a6f2b5d8a5!
+abort: push includes unstable 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
 - 1f0dee641bb7
 $ hg up --hidden 3 -q
 working directory parent is obsolete! (0d3f46688ccc)
 $ mkcommit obsol_d # 6
 created new head
-1 new orphan changesets
+1 new unstable changesets
 $ hg debugobsolete `getid 5` `getid 6`
 obsoleted 1 changesets
 $ qlog
 6
 - 95de7fc6918d
 3
 - 0d3f46688ccc
 $ hg push ../other-new
 pushing to ../other-new
 searching for changes
-abort: push includes orphan changeset: 95de7fc6918d!
+abort: push includes unstable 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 unstability
 pushing to ../other-new
 searching for changes
 $ hg up --hidden -q .^ # 3
 working directory parent is obsolete! (0d3f46688ccc)
 $ mkcommit "obsol_d'" # 7
 created new head
-1 new orphan changesets
+1 new unstable changesets
 $ hg debugobsolete `getid 6` `getid 7`
 obsoleted 1 changesets
 $ hg pull -R ../other-new .
 pulling from .
 searching for changes
 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
 (run 'hg heads' to see heads, 'hg merge' to merge)
 $ qlog -R ../other-new
 6
 - 909a0fb57e5d
 3
 $ hg up --hidden .^ -q # 3
 working directory parent is obsolete! (0d3f46688ccc)
 $ mkcommit "obsol_d''"
 created new head
-1 new orphan changesets
+1 new unstable changesets
 $ hg debugobsolete `getid 7` `getid 8`
 obsoleted 1 changesets
 $ cd ../other-new
 $ hg up -q 3
 $ hg pull ../local/
 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
 (run 'hg heads' to see heads, 'hg merge' to merge)
 $ hg up -q 7 # to check rollback update behavior
 $ qlog
 7
 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
+unstable: 1 changesets
 $ qlog
 6
 - 909a0fb57e5d
 3
 - 725c380fe99b
 should not rebase extinct changesets
 #excluded 'whole rebase set is extinct and ignored.' message not in core
 $ hg rebase -b '3' -d 4 --traceback --config experimental.rebaseskipobsolete=0
 rebasing 3:0d3f46688ccc "add obsol_c"
-rebasing 8:159dfc9fa5d3 "add obsol_d''"
+rebasing 8:159dfc9fa5d3 "add obsol_d''" (tip)
-2 new content-divergent changesets
+2 new divergent changesets
 $ hg --hidden log -q -r 'successors(3)'
 4:725c380fe99b
 10:2033b4e49474
 $ hg up tip
 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
 check bumped detection
 (make an obsolete changeset public)
 $ cd local
 $ hg phase --hidden --public 11
-1 new phase-divergent changesets
+1 new bumped changesets
 $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n'
 @  12 - (draft) 6db5e282cb91 add obsol_d'''
 |
 | o  11 - (public) 9468a5f5d8b2 add obsol_d''
 |/
 changeset:   12:6db5e282cb91
 tag:         tip
 parent:      10:2033b4e49474
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
-instability: phase-divergent
+trouble:     bumped
 summary:     add obsol_d'''
 $ hg push ../other-new/
 pushing to ../other-new/
 searching for changes
-abort: push includes phase-divergent changeset: 6db5e282cb91!
+abort: push includes bumped changeset: 6db5e282cb91!
 (use 'hg evolve' to get a stable history or --force to ignore warnings)
 [255]
 Check hg commit --amend compat
 $ mkcommit f
 created new head
 $ echo 42 >> f
 $ hg commit --amend --traceback --quiet
 $ hg log -G
-@  changeset:   14:705ab2a6b72e
+@  changeset:   15:705ab2a6b72e
 |  tag:         tip
 |  parent:      10:2033b4e49474
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     add f
 |
 | o  changeset:   12:6db5e282cb91
 |/   parent:      10:2033b4e49474
 |    user:        test
 |    date:        Thu Jan 01 00:00:00 1970 +0000
-|    instability: phase-divergent
+|    trouble:     bumped
 |    summary:     add obsol_d'''
 |
 | o  changeset:   11:9468a5f5d8b2
 |/   user:        test
 |    date:        Thu Jan 01 00:00:00 1970 +0000
 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'}
-0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
+0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
-159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
+159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
 #no produced by 2.3
 33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob)
 Check divergence detection (note: multiple successors is sorted by changeset hash)
 $ hg up 9468a5f5d8b2 #  add obsol_d''
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 $ mkcommit "obsolet_conflicting_d"
 $ hg summary
-parent: 15:50f11e5e3a63 tip
+parent: 1[46]:50f11e5e3a63 tip (re)
 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
+bumped: 1 changesets
 $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
 $ hg log -r 'contentdivergent()'
 changeset:   12:6db5e282cb91
 parent:      10:2033b4e49474
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
-instability: phase-divergent, content-divergent
+trouble:     bumped, divergent
 summary:     add obsol_d'''
-changeset:   15:50f11e5e3a63
+changeset:   16:50f11e5e3a63
 tag:         tip
 parent:      11:9468a5f5d8b2
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
-instability: content-divergent
+trouble:     divergent
 summary:     add obsolet_conflicting_d
 $ hg up --hidden 3 -q
 working directory parent is obsolete! (0d3f46688ccc)
 [4] add obsol_c'
 [10] add obsol_c
 [2]
 $ hg olog
 @  0d3f46688ccc (3) add obsol_c
-|    rewritten(parent) as 2033b4e49474 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+|    rewritten(parent) as 2033b4e49474 by test (Thu Jan 01 00:00:00 1970 +0000)
 |    rewritten as 725c380fe99b by test (Thu Jan 01 00:00:00 1970 +0000)
 |
 x  4538525df7e2 (2) add c
 rewritten as 0d3f46688ccc by test (Thu Jan 01 00:00:00 1970 +0000)
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 working directory parent is obsolete! (4538525df7e2)
 (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
 $ hg export 9468a5f5d8b2 | hg import -
 applying patch from stdin
-1 new orphan changesets
+1 new unstable changesets
 Relevant marker computation
 ==============================
 $ hg log -G --hidden
-@  changeset:   16:a5f7a21fe7bc
+@  changeset:   17:a5f7a21fe7bc
 |  tag:         tip
 |  parent:      2:4538525df7e2
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
-|  instability: orphan
+|  trouble:     unstable
 |  summary:     add obsol_d''
 |
-| o  changeset:   15:50f11e5e3a63
+| o  changeset:   16:50f11e5e3a63
 | |  parent:      11:9468a5f5d8b2
 | |  user:        test
 | |  date:        Thu Jan 01 00:00:00 1970 +0000
-| |  instability: content-divergent
+| |  trouble:     divergent
 | |  summary:     add obsolet_conflicting_d
 | |
-| | o  changeset:   14:705ab2a6b72e
+| | o  changeset:   15:705ab2a6b72e
 | | |  parent:      10:2033b4e49474
 | | |  user:        test
 | | |  date:        Thu Jan 01 00:00:00 1970 +0000
 | | |  summary:     add f
 | | |
+| | | x  changeset:   14:33d458d86621
+| | | |  user:        test
+| | | |  date:        Thu Jan 01 00:00:00 1970 +0000
+| | | |  obsolete:    pruned
+| | | |  summary:     temporary amend commit for 0b1b6dd009c0
+| | | |
 | | | x  changeset:   13:0b1b6dd009c0
 | | |/   parent:      10:2033b4e49474
 | | |    user:        test
 | | |    date:        Thu Jan 01 00:00:00 1970 +0000
-| | |    obsolete:    amended using amend as 14:705ab2a6b72e
+| | |    obsolete:    amended as 705ab2a6b72e
 | | |    summary:     add f
 | | |
 | | | o  changeset:   12:6db5e282cb91
 | | |/   parent:      10:2033b4e49474
 | | |    user:        test
 | | |    date:        Thu Jan 01 00:00:00 1970 +0000
-| | |    instability: phase-divergent, content-divergent
+| | |    trouble:     bumped, divergent
 | | |    summary:     add obsol_d'''
 | | |
 | o |  changeset:   11:9468a5f5d8b2
 | |/   user:        test
 | |    date:        Thu Jan 01 00:00:00 1970 +0000
 | |
 | | x  changeset:   8:159dfc9fa5d3
 | | |  parent:      3:0d3f46688ccc
 | | |  user:        test
 | | |  date:        Thu Jan 01 00:00:00 1970 +0000
-| | |  obsolete:    rebased using rebase as 11:9468a5f5d8b2
+| | |  obsolete:    rebased as 9468a5f5d8b2
 | | |  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
+| | |    obsolete:    rewritten as 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
+| | |    obsolete:    rewritten as 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 95de7fc6918d
-| | |    obsolete:    rewritten as 15:50f11e5e3a63
+| | |    obsolete:    rewritten as 50f11e5e3a63
 | | |    summary:     add d
 | | |
 | o |  changeset:   4:725c380fe99b
 | | |  parent:      1:7c3bad9141dc
 | | |  user:        test
 | | |
 | | x  changeset:   3:0d3f46688ccc
 | |/   parent:      1:7c3bad9141dc
 | |    user:        test
 | |    date:        Thu Jan 01 00:00:00 1970 +0000
-| |    obsolete:    rewritten as 4:725c380fe99b
+| |    obsolete:    rewritten as 725c380fe99b
-| |    obsolete:    rebased using rebase as 10:2033b4e49474
+| |    obsolete:    rebased as 2033b4e49474
 | |    summary:     add obsol_c
 | |
 x |  changeset:   2:4538525df7e2
 |/   user:        test
 |    date:        Thu Jan 01 00:00:00 1970 +0000
-|    obsolete:    rewritten as 3:0d3f46688ccc
+|    obsolete:    rewritten as 0d3f46688ccc
 |    summary:     add c
 |
 o  changeset:   1:7c3bad9141dc
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
 simple rewrite with a prune attached to it
 $ hg debugobsolete --rev 15
-a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 50f11e5e3a63806e678c734e525502f522d37e38 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+33d458d86621f3186c40bfccd77652f4a122743e 0 {0b1b6dd009c037985363e2290a0b579819f659db} (*) {'ef1': '*', 'user': 'test'} (glob)
 Transitive rewrite
 $ hg --hidden debugobsolete --rev 8
 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

branch	mercurial-4.3
changeset 3818	f8677cb11dcb
parent 3591	98941c28f3e2
child 3592	7a5c3175015e
child 3936	537fd9a86c06