Mercurial > evolve

changeset 3431:2e703ed1c713

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: update output for wider reporting of troubled changesets CORE-TEST-OUTPUT-UPDATE: 1a09dad8b85a
author Martin von Zweigbergk <martinvonz@google.com>
date Sat, 13 Jan 2018 14:35:49 -0800
parents 14fbb847be5a
children f57be161f34b
files tests/test-evolve-obshistory-complex.t tests/test-evolve-templates.t tests/test-evolve-topic.t tests/test-exchange-obsmarkers-case-A3.t tests/test-exchange-obsmarkers-case-A4.t tests/test-exchange-obsmarkers-case-B5.t tests/test-exchange-obsmarkers-case-C4.t tests/test-exchange-obsmarkers-case-D1.t tests/test-exchange-obsmarkers-case-D4.t tests/test-obsolete.t tests/test-push-checkheads-partial-C2.t tests/test-push-checkheads-partial-C4.t tests/test-push-checkheads-pruned-B2.t tests/test-push-checkheads-pruned-B3.t tests/test-push-checkheads-pruned-B4.t tests/test-push-checkheads-pruned-B5.t tests/test-push-checkheads-pruned-B8.t tests/test-push-checkheads-superceed-A2.t tests/test-push-checkheads-superceed-A3.t tests/test-push-checkheads-superceed-A6.t tests/test-push-checkheads-superceed-A7.t tests/test-push-checkheads-unpushed-D2.t tests/test-push-checkheads-unpushed-D3.t tests/test-push-checkheads-unpushed-D4.t tests/test-push-checkheads-unpushed-D5.t tests/test-sharing.t tests/test-split.t tests/test-stack-branch.t tests/test-topic-change.t tests/test-topic-debugcb.t tests/test-topic-stack-complex.t tests/test-topic-stack-data.t tests/test-topic-stack.t tests/test-tutorial.t
diffstat 34 files changed, 54 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-complex.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-evolve-obshistory-complex.t	Sat Jan 13 14:35:49 2018 -0800
@@ -67,8 +67,8 @@
 ------------------------
 
   $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0"
+  4 new orphan changesets
   2 changesets folded
-  4 new orphan changesets
   $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1"
   2 changesets folded
   $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" -n "folding changesets to test"
@@ -208,6 +208,7 @@
   record this change to 'D'? [Ynesfdaq?] Y
   
   no more change to split
+  1 new orphan changesets
   $ hg split "desc(fold2)" -d "0 0" << EOF
   > Y
   > Y
@@ -242,6 +243,7 @@
   record this change to 'F'? [Ynesfdaq?] Y
   
   no more change to split
+  1 new orphan changesets
   $ hg log -G
   @  changeset:   15:d4a000f63ee9
   |  tag:         tip
--- a/tests/test-evolve-templates.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-evolve-templates.t	Sat Jan 13 14:35:49 2018 -0800
@@ -1153,6 +1153,7 @@
 
   $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
   obsoleted 1 changesets
   $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
--- a/tests/test-evolve-topic.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-evolve-topic.t	Sat Jan 13 14:35:49 2018 -0800
@@ -249,6 +249,7 @@
   o  0 - {} 199cc73e9a0b add aaa (draft)
   
   $ hg topic -r 070c5573d8f9 bar
+  4 new orphan changesets
   changed topic on 1 changes
   $ hg up 16d6f664b17c
   switching to topic bar
--- a/tests/test-exchange-obsmarkers-case-A3.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-A3.t	Sat Jan 13 14:35:49 2018 -0800
@@ -74,6 +74,7 @@
   created new head
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
   obsoleted 1 changesets
   $ hg log -G --hidden
@@ -178,6 +179,7 @@
   created new head
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
   obsoleted 1 changesets
   $ hg log -G --hidden
@@ -248,6 +250,7 @@
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   remote: 1 new obsolescence markers
   remote: obsoleted 1 changesets
+  remote: 1 new orphan changesets
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -264,9 +267,9 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
   obsoleted 1 changesets
+  1 new orphan changesets
   new changesets e5ea8f9c7314
   (run 'hg heads' to see heads, 'hg merge' to merge)
-  1 new orphan changesets
   ## post pull state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-A4.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-A4.t	Sat Jan 13 14:35:49 2018 -0800
@@ -65,6 +65,7 @@
   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg log -G --hidden
   @  e5ea8f9c7314 (draft): A1
   |
--- a/tests/test-exchange-obsmarkers-case-B5.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-B5.t	Sat Jan 13 14:35:49 2018 -0800
@@ -71,6 +71,7 @@
   $ mkcommit B1
   $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'`
   obsoleted 1 changesets
+  2 new orphan changesets
   $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'`
   $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'`
   obsoleted 1 changesets
--- a/tests/test-exchange-obsmarkers-case-C4.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-C4.t	Sat Jan 13 14:35:49 2018 -0800
@@ -67,6 +67,7 @@
   $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'`
   obsoleted 1 changesets
   $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'`
+  2 new content-divergent changesets
   $ hg prune -qd '0 0' .
   $ hg log -G --hidden
   x  7f7f229b13a6 (draft): C
--- a/tests/test-exchange-obsmarkers-case-D1.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-D1.t	Sat Jan 13 14:35:49 2018 -0800
@@ -62,6 +62,7 @@
   created new head
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg prune -d '0 0' 'desc(B)'
   1 changesets pruned
   $ hg strip --hidden -q 'desc(A0)' --config devel.strip-obsmarkers=no
--- a/tests/test-exchange-obsmarkers-case-D4.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-exchange-obsmarkers-case-D4.t	Sat Jan 13 14:35:49 2018 -0800
@@ -60,6 +60,7 @@
   $ mkcommit B1
   $ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'`
   $ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
   obsoleted 1 changesets
--- a/tests/test-obsolete.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-obsolete.t	Sat Jan 13 14:35:49 2018 -0800
@@ -187,6 +187,7 @@
   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
@@ -210,8 +211,8 @@
   $ hg up --hidden 3 -q
   working directory parent is obsolete! (0d3f46688ccc)
   $ mkcommit obsol_d # 6
+  1 new orphan changesets
   created new head
-  1 new orphan changesets
   $ hg debugobsolete `getid 5` `getid 6`
   obsoleted 1 changesets
   $ qlog
@@ -269,8 +270,8 @@
   $ hg up --hidden -q .^ # 3
   working directory parent is obsolete! (0d3f46688ccc)
   $ mkcommit "obsol_d'" # 7
+  1 new orphan changesets
   created new head
-  1 new orphan changesets
   $ hg debugobsolete `getid 6` `getid 7`
   obsoleted 1 changesets
   $ hg pull -R ../other-new .
@@ -360,8 +361,8 @@
   $ hg up --hidden .^ -q # 3
   working directory parent is obsolete! (0d3f46688ccc)
   $ mkcommit "obsol_d''"
+  1 new orphan changesets
   created new head
-  1 new orphan changesets
   $ hg debugobsolete `getid 7` `getid 8`
   obsoleted 1 changesets
   $ cd ../other-new
@@ -426,6 +427,7 @@
   $ 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
@@ -554,6 +556,7 @@
   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
@@ -684,6 +687,7 @@
   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
--- a/tests/test-push-checkheads-partial-C2.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-push-checkheads-partial-C2.t	Sat Jan 13 14:35:49 2018 -0800
@@ -61,6 +61,7 @@
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg log -G --hidden
   @  f6082bc4ffef (draft): A1
   |
--- a/tests/test-push-checkheads-partial-C4.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-push-checkheads-partial-C4.t	Sat Jan 13 14:35:49 2018 -0800
@@ -61,6 +61,7 @@
   created new head
   $ hg debugobsolete --record-parents `getid "desc(A0)"`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg log -G --hidden
   @  0f88766e02d6 (draft): C0
   |
--- a/tests/test-push-checkheads-pruned-B2.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B2.t	Sat Jan 13 14:35:49 2018 -0800
@@ -61,6 +61,7 @@
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg debugobsolete --record-parents `getid "desc(B0)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
--- a/tests/test-push-checkheads-pruned-B3.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B3.t	Sat Jan 13 14:35:49 2018 -0800
@@ -61,6 +61,7 @@
   created new head
   $ hg debugobsolete --record-parents `getid "desc(A0)"`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
--- a/tests/test-push-checkheads-pruned-B4.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B4.t	Sat Jan 13 14:35:49 2018 -0800
@@ -62,6 +62,7 @@
   created new head
   $ hg debugobsolete --record-parents `getid "desc(A0)"`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg debugobsolete --record-parents `getid "desc(B0)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
--- a/tests/test-push-checkheads-pruned-B5.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B5.t	Sat Jan 13 14:35:49 2018 -0800
@@ -65,6 +65,7 @@
   created new head
   $ hg debugobsolete --record-parents `getid "desc(A0)"`
   obsoleted 1 changesets
+  2 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg debugobsolete --record-parents `getid "desc(C0)"`
--- a/tests/test-push-checkheads-pruned-B8.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-push-checkheads-pruned-B8.t	Sat Jan 13 14:35:49 2018 -0800
@@ -68,6 +68,7 @@
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg debugobsolete --record-parents `getid "desc(B1)"`
--- a/tests/test-push-checkheads-superceed-A2.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A2.t	Sat Jan 13 14:35:49 2018 -0800
@@ -61,6 +61,7 @@
   $ mkcommit B1
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
--- a/tests/test-push-checkheads-superceed-A3.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A3.t	Sat Jan 13 14:35:49 2018 -0800
@@ -64,6 +64,7 @@
   $ mkcommit A1
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
--- a/tests/test-push-checkheads-superceed-A6.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A6.t	Sat Jan 13 14:35:49 2018 -0800
@@ -70,6 +70,7 @@
   $ mkcommit B1
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
--- a/tests/test-push-checkheads-superceed-A7.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-push-checkheads-superceed-A7.t	Sat Jan 13 14:35:49 2018 -0800
@@ -70,6 +70,7 @@
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
--- a/tests/test-push-checkheads-unpushed-D2.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D2.t	Sat Jan 13 14:35:49 2018 -0800
@@ -65,6 +65,7 @@
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg debugobsolete --record-parents `getid "desc(B0)"`
   obsoleted 1 changesets
   $ hg up 0
--- a/tests/test-push-checkheads-unpushed-D3.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D3.t	Sat Jan 13 14:35:49 2018 -0800
@@ -68,6 +68,7 @@
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
--- a/tests/test-push-checkheads-unpushed-D4.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D4.t	Sat Jan 13 14:35:49 2018 -0800
@@ -84,6 +84,7 @@
   $ mkcommit B1
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
--- a/tests/test-push-checkheads-unpushed-D5.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-push-checkheads-unpushed-D5.t	Sat Jan 13 14:35:49 2018 -0800
@@ -73,6 +73,7 @@
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
   obsoleted 1 changesets
+  1 new orphan changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
   obsoleted 1 changesets
   $ hg log -G --hidden
@@ -107,5 +108,6 @@
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
   obsoleted 1 changesets
+  1 new orphan changesets
 
   $ cd ../..
--- a/tests/test-sharing.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-sharing.t	Sat Jan 13 14:35:49 2018 -0800
@@ -485,9 +485,9 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
+  2 new content-divergent changesets
   new changesets e3f99ce9d9cd
   (run 'hg heads' to see heads, 'hg merge' to merge)
-  2 new content-divergent changesets
 
 Figure SG09: multiple heads! divergence! oh my!
   $ hg --hidden shortlog -G -r 3::
--- a/tests/test-split.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-split.t	Sat Jan 13 14:35:49 2018 -0800
@@ -203,6 +203,7 @@
   
   created new head
   Done splitting? [yN] y
+  2 new orphan changesets
 
 Stop before splitting the commit completely creates a commit with all the
 remaining changes
--- a/tests/test-stack-branch.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-stack-branch.t	Sat Jan 13 14:35:49 2018 -0800
@@ -109,6 +109,7 @@
 
   $ echo bbb > ddd
   $ hg commit --amend
+  2 new orphan changesets
   $ hg log -G
   @  6 foo {} draft c_d
   |
@@ -225,6 +226,7 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo ccc > ddd
   $ hg commit --amend -m 'c_D' 
+  4 new orphan changesets
   $ hg rebase -d . -s 'desc(c_g)'
   rebasing 9:2ebb6e48ab8a "c_g"
   rebasing 10:634f38e27a1d "c_h"
--- a/tests/test-topic-change.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-topic-change.t	Sat Jan 13 14:35:49 2018 -0800
@@ -147,6 +147,7 @@
 Changing topic in between the stack
 
   $ hg topic -r 9::10 --current
+  5 new orphan changesets
   changed topic on 2 changes
   $ hg glog
   o  22:1b88140feefe {foobar}
@@ -371,6 +372,7 @@
 
   $ hg topic -r . watwat
   switching to topic watwat
+  1 new orphan changesets
   changed topic on 1 changes
 
   $ hg glog
--- a/tests/test-topic-debugcb.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-topic-debugcb.t	Sat Jan 13 14:35:49 2018 -0800
@@ -255,6 +255,7 @@
   changed topic to "bar" on 2 revisions
   switching to topic foo
   changed topic to "foo" on 2 revisions
+  2 new orphan changesets
 
   $ hg log -G
   @  [9:b14d13efcfa7] E
--- a/tests/test-topic-stack-complex.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-topic-stack-complex.t	Sat Jan 13 14:35:49 2018 -0800
@@ -81,6 +81,7 @@
   examine changes to 'd'? [Ynesfdaq?] n
   
   Done splitting? [yN] y
+  1 new orphan changesets
 
   $ hg stack
   ### topic: foo
--- a/tests/test-topic-stack-data.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-topic-stack-data.t	Sat Jan 13 14:35:49 2018 -0800
@@ -73,6 +73,7 @@
   $ hg up 'desc(fuz_a)'
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg commit --amend --message 'fuz1_a'
+  2 new orphan changesets
 
 A topic with multiple heads
 
@@ -91,6 +92,7 @@
   $ hg up 'desc(bar_d)'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg commit --amend --message 'bar1_d'
+  1 new orphan changesets
 
 topic 'foo' on the multi headed branch
 
--- a/tests/test-topic-stack.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-topic-stack.t	Sat Jan 13 14:35:49 2018 -0800
@@ -262,6 +262,7 @@
 
   $ echo bbb > ddd
   $ hg commit --amend
+  2 new orphan changesets
   $ hg log -G
   @  6 default {foo} draft c_d
   |
@@ -396,6 +397,7 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo ccc > ddd
   $ hg commit --amend -m 'c_D' 
+  4 new orphan changesets
   $ hg rebase -d . -s 'desc(c_g)'
   rebasing 9:81264ae8a36a "c_g" (foo)
   rebasing 10:fde5f5941642 "c_h" (foo)
@@ -486,6 +488,7 @@
 Changing topics on some commits in between
   $ hg topic foobar -r 'desc(c_e) + desc(c_D)'
   switching to topic foobar
+  4 new orphan changesets
   changed topic on 2 changes
   $ hg log -G
   @  17 default {foobar} draft c_D
@@ -511,6 +514,7 @@
   $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()'
   rebasing 15:77082e55de88 "c_f" (foo)
   switching to topic foo
+  1 new orphan changesets
   switching to topic foobar
   $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()'
   rebasing 12:0c3e8aed985d "c_g" (foo)
@@ -662,6 +666,7 @@
   switching to topic red
   0 files updated, 0 files merged, 6 files removed, 0 files unresolved
   $ hg commit --amend --user test2
+  7 new orphan changesets
   $ hg up 'desc("c_C")'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg commit --amend --user test2
@@ -822,6 +827,7 @@
   $ echo zzz > Z
   $ hg add Z
   $ hg commit --amend
+  1 new orphan changesets
   $ hg status --change .
   A Z
   A ggg
--- a/tests/test-tutorial.t	Fri Jan 19 19:18:05 2018 +0100
+++ b/tests/test-tutorial.t	Sat Jan 13 14:35:49 2018 -0800
@@ -1213,9 +1213,9 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  1 new orphan changesets
   new changesets bf1b0d202029
   (run 'hg update' to get a working copy)
-  1 new orphan changesets
 
 
 The new changeset "animal" is based on an old changeset of "bathroom". You can