--- a/tests/test-obsolete.t Thu Aug 02 02:42:15 2018 +0200
+++ b/tests/test-obsolete.t Thu Aug 02 02:47:44 2018 +0200
@@ -121,8 +121,6 @@
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
@@ -188,7 +186,6 @@
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
@@ -212,8 +209,8 @@
$ hg up --hidden 3 -q
working directory parent is obsolete! (0d3f46688ccc)
$ mkcommit obsol_d # 6
+ created new head
1 new orphan changesets
- created new head
$ hg debugobsolete `getid 5` `getid 6`
obsoleted 1 changesets
$ qlog
@@ -271,8 +268,8 @@
$ hg up --hidden -q .^ # 3
working directory parent is obsolete! (0d3f46688ccc)
$ mkcommit "obsol_d'" # 7
+ created new head
1 new orphan changesets
- created new head
$ hg debugobsolete `getid 6` `getid 7`
obsoleted 1 changesets
$ hg pull -R ../other-new .
@@ -362,8 +359,8 @@
$ hg up --hidden .^ -q # 3
working directory parent is obsolete! (0d3f46688ccc)
$ mkcommit "obsol_d''"
+ created new head
1 new orphan changesets
- created new head
$ hg debugobsolete `getid 7` `getid 8`
obsoleted 1 changesets
$ cd ../other-new
@@ -428,7 +425,6 @@
$ 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 bumped warning
@@ -488,7 +484,7 @@
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'
| |
@@ -502,7 +498,7 @@
$ 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'
|/
@@ -536,9 +532,9 @@
$ 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
|
@@ -557,7 +553,6 @@
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
@@ -625,7 +620,7 @@
| 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
@@ -688,7 +683,6 @@
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
@@ -707,8 +701,6 @@
$ 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:
@@ -727,8 +719,6 @@
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)
@@ -749,7 +739,7 @@
| 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
@@ -769,7 +759,7 @@
| | | 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