tests/test-stabilize-order.t
branchmercurial-4.3
changeset 3106 a867d59ea97a
parent 3105 f5d472b7e800
child 3108 9c9c8c1eeb93
child 3116 9f900937c198
--- a/tests/test-stabilize-order.t	Fri Oct 20 19:32:18 2017 +0200
+++ b/tests/test-stabilize-order.t	Fri Oct 20 20:04:13 2017 +0200
@@ -38,14 +38,14 @@
   [2] addb
   $ echo b >> b
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg gdown
   gdown have been deprecated in favor of previous
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   [1] adda
   $ echo a >> a
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
   $ glog
   @  7:005fe5914f78@default(draft) adda
   |
@@ -110,10 +110,10 @@
   --- successors.old* (glob)
   +++ successors.new* (glob)
   @@ -3,3 +3,4 @@
-   93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'ef1': '8', 'user': 'test'} (glob)
-   7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'ef1': '0', 'user': 'test'} (glob)
-   22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (*) {'ef1': '4', 'user': 'test'} (glob)
-  +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (*) {'ef1': '4', 'user': 'test'} (glob)
+   93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+   7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'ef1': '*', 'user': 'test'} (glob)
+   22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+  +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (*) {'ef1': '*', 'user': 'test'} (glob)
   [1]
 
 
@@ -137,7 +137,7 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo b >> b
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
   $ glog
   @  11:7a68bc4596ea@default(draft) addb
   |
@@ -195,7 +195,7 @@
   $ hg up .^
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg commit --amend -m "newmessage"
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg log -G
   @  changeset:   15:f83a0bce03e4
   |  tag:         tip
@@ -208,13 +208,13 @@
   | |  parent:      12:2256dae6521f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  instability: orphan
+  | |  trouble:     unstable
   | |  summary:     secondambiguous
   | |
   | | o  changeset:   13:bdc003b6eec2
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    instability: orphan
+  | |    trouble:     unstable
   | |    summary:     firstambiguous
   | |
   | x  changeset:   12:2256dae6521f