evolve: comparison tests/test-obsolete.t

equal deleted inserted replaced

-:f5d472b7e800
+:a867d59ea97a
 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
 $ 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/
 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
 #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''" (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
 |
 | 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
 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:   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)
 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 --contentdivergent' to resolve the issue)
 $ hg export 9468a5f5d8b2 | hg import -
 applying patch from stdin
-1 new orphan changesets
+1 new unstable changesets
 Relevant marker computation
 ==============================
 @  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:   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:   15:705ab2a6b72e
 | | |  parent:      10:2033b4e49474
 | | |  user:        test
 | | |
 | | | 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

branch	mercurial-4.3
changeset 3106	a867d59ea97a
parent 3105	f5d472b7e800
child 3108	9c9c8c1eeb93
child 3116	9f900937c198