evolve: comparison tests/test-obsolete.t

equal deleted inserted replaced

-:ef1c322c389d
+:f54bb6eaf5e6
 3
 - 0d3f46688ccc
 4
 - 725c380fe99b
 $ hg up --hidden 3 -q
-updating to a 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
 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
 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
 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`
 obsoleted 1 changesets
 $ qlog
 6
 [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`
 obsoleted 1 changesets
 $ hg pull -R ../other-new .
 pulling from .
 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`
 obsoleted 1 changesets
 $ cd ../other-new
 $ hg up -q 3
 $ mkcommit toto # 9
 created new head
 $ hg id -n
 9
 $ hg debugobsolete `getid 0` `getid 9`
-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
 $ 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  8 - 159dfc9fa5d3 add obsol_d''
 |
 | o  4 - 725c380fe99b add obsol_c'
 | |
 x |  3 - 0d3f46688ccc add obsol_c
 |/
 $ hg log -G  --template='{rev} - {node|short} {desc}\n' --hidden
 x  9 - 83b5778897ad add toto
-*  8 - 159dfc9fa5d3 add obsol_d''
+o  8 - 159dfc9fa5d3 add obsol_d''
 |
 | x  7 - 909a0fb57e5d add obsol_d'
 |/
 | x  6 - 95de7fc6918d add obsol_d
 |/
 #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''"
-2 new content-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)
 $ hg log -G --template='{rev} - {node|short} {desc}\n'
 @  11 - 9468a5f5d8b2 add obsol_d''
 |
-*  10 - 2033b4e49474 add obsol_c
+o  10 - 2033b4e49474 add obsol_c
 |
-*  4 - 725c380fe99b add obsol_c'
+o  4 - 725c380fe99b add obsol_c'
 |
 o  1 - 7c3bad9141dc add b
 |
 o  0 - 1f0dee641bb7 add a
 adding manifests
 adding file changes
 added 2 changesets with 1 changes to [12] files (re)
 3 new obsolescence markers
 obsoleted 1 changesets
-2 new content-divergent changesets
 $ hg up -q 10
 $ mkcommit "obsol_d'''"
 created new head
 $ hg debugobsolete `getid 11` `getid 12`
 obsoleted 1 changesets
 check phase divergence detection
 (make an obsolete changeset public)
 $ cd local
 $ hg phase --hidden --public 11
-1 new phase-divergent changesets
 $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n'
 @  12 - (draft) 6db5e282cb91 add obsol_d'''
 |
 | o  11 - (public) 9468a5f5d8b2 add obsol_d''
 |/
 |  parent:      10:2033b4e49474
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  summary:     add f
 |
-| *  changeset:   12:6db5e282cb91
+| o  changeset:   12:6db5e282cb91
 |/   parent:      10:2033b4e49474
 |    user:        test
 |    date:        Thu Jan 01 00:00:00 1970 +0000
 |    instability: phase-divergent
 |    summary:     add obsol_d'''
 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 a7a6f2b5d8a5` `getid 50f11e5e3a63`
-2 new content-divergent changesets
 $ hg log -r 'contentdivergent()'
 changeset:   12:6db5e282cb91
 parent:      10:2033b4e49474
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 instability: content-divergent
 summary:     add obsolet_conflicting_d
 $ hg up --hidden 3 -q
-updating to a hidden changeset 0d3f46688ccc
-(hidden revision '0d3f46688ccc' has diverged)
 working directory parent is obsolete! (0d3f46688ccc)
 $ hg evolve
 parent is obsolete with multiple successors:
 [4] add obsol_c'
 [10] add obsol_c
 Check import reports new unstable changeset:
 $ hg up --hidden 2
-updating to a hidden changeset 4538525df7e2
-(hidden revision '4538525df7e2' has diverged)
 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
 Relevant marker computation
 ==============================
 |  user:        test
 |  date:        Thu Jan 01 00:00:00 1970 +0000
 |  instability: orphan
 |  summary:     add obsol_d''
 |
-| *  changeset:   15:50f11e5e3a63
+| o  changeset:   15:50f11e5e3a63
 | |  parent:      11:9468a5f5d8b2
 | |  user:        test
 | |  date:        Thu Jan 01 00:00:00 1970 +0000
 | |  instability: content-divergent
 | |  summary:     add obsolet_conflicting_d
 | | |    user:        test
 | | |    date:        Thu Jan 01 00:00:00 1970 +0000
 | | |    obsolete:    amended using amend as 14:705ab2a6b72e
 | | |    summary:     add f
 | | |
-| | | *  changeset:   12:6db5e282cb91
+| | | o  changeset:   12:6db5e282cb91
 | | |/   parent:      10:2033b4e49474
 | | |    user:        test
 | | |    date:        Thu Jan 01 00:00:00 1970 +0000
 | | |    instability: phase-divergent, content-divergent
 | | |    summary:     add obsol_d'''

branch	mercurial-4.4
changeset 4516	f54bb6eaf5e6
parent 4363	a2fdbece7ce1
parent 4513	d70db7e455dc
child 4675	79bc0f1a832e