diff tests/test-evolve-orphan-merge.t @ 3715:a77fb9669e99 mercurial-4.3

test-compat: merge mercurial-4.4 into mercurial-4.3

--- a/tests/test-evolve-orphan-merge.t	Mon Apr 23 12:11:10 2018 +0200
+++ b/tests/test-evolve-orphan-merge.t	Mon Apr 23 12:23:00 2018 +0200
@@ -51,10 +51,10 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo bar > b
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
 
   $ hg glog
-  @  4:64370c9805e7 added b
+  @  5:64370c9805e7 added b
   |   () draft
   | o    3:3b2b6f4652ee merging a and b
   | |\    () draft
@@ -67,13 +67,13 @@
 
   $ hg evolve --all
   move:[3] merging a and b
-  atop:[4] added b
+  atop:[5] added b
   working directory is now at 91fd62122a4b
 
   $ hg glog
-  @    5:91fd62122a4b merging a and b
+  @    6:91fd62122a4b merging a and b
   |\    () draft
-  | o  4:64370c9805e7 added b
+  | o  5:64370c9805e7 added b
   | |   () draft
   o |  1:c7586e2a9264 added a
   |/    () draft
@@ -81,9 +81,9 @@
       () draft
 
   $ hg parents
-  changeset:   5:91fd62122a4b
+  changeset:   6:91fd62122a4b
   tag:         tip
-  parent:      4:64370c9805e7
+  parent:      5:64370c9805e7
   parent:      1:c7586e2a9264
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
@@ -96,14 +96,14 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo bar > a
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
 
   $ hg glog
-  @  6:3d41537b44ca added a
+  @  8:3d41537b44ca added a
   |   () draft
-  | o    5:91fd62122a4b merging a and b
+  | o    6:91fd62122a4b merging a and b
   | |\    () draft
-  +---o  4:64370c9805e7 added b
+  +---o  5:64370c9805e7 added b
   | |     () draft
   | x  1:c7586e2a9264 added a
   |/    () draft
@@ -111,25 +111,25 @@
       () draft
 
   $ hg evolve --all
-  move:[5] merging a and b
-  atop:[6] added a
+  move:[6] merging a and b
+  atop:[8] added a
   working directory is now at 968d205ba4d8
 
   $ hg glog
-  @    7:968d205ba4d8 merging a and b
+  @    9:968d205ba4d8 merging a and b
   |\    () draft
-  | o  6:3d41537b44ca added a
+  | o  8:3d41537b44ca added a
   | |   () draft
-  o |  4:64370c9805e7 added b
+  o |  5:64370c9805e7 added b
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
 
   $ hg parents
-  changeset:   7:968d205ba4d8
+  changeset:   9:968d205ba4d8
   tag:         tip
-  parent:      6:3d41537b44ca
-  parent:      4:64370c9805e7
+  parent:      8:3d41537b44ca
+  parent:      5:64370c9805e7
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merging a and b
@@ -148,15 +148,15 @@
   $ hg ci -Aqm "bar to c"
 
   $ hg glog
-  @  9:d0f84b25d4e3 bar to c
+  @  11:d0f84b25d4e3 bar to c
   |   () draft
-  | o  8:1c165c673853 foo to c
+  | o  10:1c165c673853 foo to c
   |/    () draft
-  | o    7:968d205ba4d8 merging a and b
+  | o    9:968d205ba4d8 merging a and b
   | |\    () draft
-  +---o  6:3d41537b44ca added a
+  +---o  8:3d41537b44ca added a
   | |     () draft
-  | o  4:64370c9805e7 added b
+  | o  5:64370c9805e7 added b
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -166,9 +166,9 @@
   3 changesets pruned
 
   $ hg glog
-  @  9:d0f84b25d4e3 bar to c
+  @  11:d0f84b25d4e3 bar to c
   |   () draft
-  | o  8:1c165c673853 foo to c
+  | o  10:1c165c673853 foo to c
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -185,11 +185,11 @@
   $ hg ci -m "foobar to c"
 
   $ hg glog
-  @    10:fd41d25a3e90 foobar to c
+  @    12:fd41d25a3e90 foobar to c
   |\    () draft
-  | o  9:d0f84b25d4e3 bar to c
+  | o  11:d0f84b25d4e3 bar to c
   | |   () draft
-  o |  8:1c165c673853 foo to c
+  o |  10:1c165c673853 foo to c
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -200,23 +200,23 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo FOO > c
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
 
   $ hg glog
-  @  11:31c317b7bdb1 foo to c
+  @  14:31c317b7bdb1 foo to c
   |   () draft
-  | o    10:fd41d25a3e90 foobar to c
+  | o    12:fd41d25a3e90 foobar to c
   | |\    () draft
-  +---o  9:d0f84b25d4e3 bar to c
+  +---o  11:d0f84b25d4e3 bar to c
   | |     () draft
-  | x  8:1c165c673853 foo to c
+  | x  10:1c165c673853 foo to c
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
 
   $ hg evolve --all
-  move:[10] foobar to c
-  atop:[11] foo to c
+  move:[12] foobar to c
+  atop:[14] foo to c
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   evolve failed!
@@ -229,24 +229,24 @@
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
-  evolving 10:fd41d25a3e90 "foobar to c"
+  evolving 12:fd41d25a3e90 "foobar to c"
   working directory is now at c5405d2da7a1
 
   $ hg glog
-  @    12:c5405d2da7a1 foobar to c
+  @    15:c5405d2da7a1 foobar to c
   |\    () draft
-  | o  11:31c317b7bdb1 foo to c
+  | o  14:31c317b7bdb1 foo to c
   | |   () draft
-  o |  9:d0f84b25d4e3 bar to c
+  o |  11:d0f84b25d4e3 bar to c
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
 
   $ hg parents
-  changeset:   12:c5405d2da7a1
+  changeset:   15:c5405d2da7a1
   tag:         tip
-  parent:      9:d0f84b25d4e3
-  parent:      11:31c317b7bdb1
+  parent:      11:d0f84b25d4e3
+  parent:      14:31c317b7bdb1
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     foobar to c
@@ -257,23 +257,23 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo foo > c
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
 
   $ hg glog
-  @  13:928097d0b5b5 foo to c
+  @  17:928097d0b5b5 foo to c
   |   () draft
-  | o    12:c5405d2da7a1 foobar to c
+  | o    15:c5405d2da7a1 foobar to c
   | |\    () draft
-  +---x  11:31c317b7bdb1 foo to c
+  +---x  14:31c317b7bdb1 foo to c
   | |     () draft
-  | o  9:d0f84b25d4e3 bar to c
+  | o  11:d0f84b25d4e3 bar to c
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
 
   $ hg evolve --all
-  move:[12] foobar to c
-  atop:[13] foo to c
+  move:[15] foobar to c
+  atop:[17] foo to c
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   evolve failed!
@@ -287,15 +287,15 @@
   continue: hg evolve --continue
 
   $ hg evolve --continue
-  evolving 12:c5405d2da7a1 "foobar to c"
+  evolving 15:c5405d2da7a1 "foobar to c"
   working directory is now at dc1948a6eeab
 
   $ hg glog
-  @    14:dc1948a6eeab foobar to c
+  @    18:dc1948a6eeab foobar to c
   |\    () draft
-  | o  13:928097d0b5b5 foo to c
+  | o  17:928097d0b5b5 foo to c
   | |   () draft
-  o |  9:d0f84b25d4e3 bar to c
+  o |  11:d0f84b25d4e3 bar to c
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -313,13 +313,13 @@
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ for ch in x y; do echo foo > $ch; hg ci -Aqm "added "$ch; done;
   $ hg glog
-  @  18:863d11043c67 added y
+  @  22:863d11043c67 added y
   |   () draft
-  o  17:3f2247835c1d added x
+  o  21:3f2247835c1d added x
   |   () draft
-  | o  16:e44dc179e7f5 added m
+  | o  20:e44dc179e7f5 added m
   | |   () draft
-  | o  15:8634bee7bf1e added l
+  | o  19:8634bee7bf1e added l
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -333,40 +333,40 @@
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ echo bar > l
   $ hg amend
-  2 new orphan changesets
+  2 new unstable changesets
 
   $ hg glog
-  @  20:fccc9de66799 added l
+  @  25:fccc9de66799 added l
   |   () draft
-  | o    19:190763373d8b merge commit
+  | o    23:190763373d8b merge commit
   | |\    () draft
-  | | o  18:863d11043c67 added y
+  | | o  22:863d11043c67 added y
   | | |   () draft
-  +---o  17:3f2247835c1d added x
+  +---o  21:3f2247835c1d added x
   | |     () draft
-  | o  16:e44dc179e7f5 added m
+  | o  20:e44dc179e7f5 added m
   | |   () draft
-  | x  15:8634bee7bf1e added l
+  | x  19:8634bee7bf1e added l
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
   $ hg evolve --all
-  move:[16] added m
-  atop:[20] added l
-  move:[19] merge commit
-  atop:[21] added m
+  move:[20] added m
+  atop:[25] added l
+  move:[23] merge commit
+  atop:[26] added m
   working directory is now at a446ad3e6700
 
   $ hg glog
-  @    22:a446ad3e6700 merge commit
+  @    27:a446ad3e6700 merge commit
   |\    () draft
-  | o  21:495d2039f8f1 added m
+  | o  26:495d2039f8f1 added m
   | |   () draft
-  | o  20:fccc9de66799 added l
+  | o  25:fccc9de66799 added l
   | |   () draft
-  o |  18:863d11043c67 added y
+  o |  22:863d11043c67 added y
   | |   () draft
-  o |  17:3f2247835c1d added x
+  o |  21:3f2247835c1d added x
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -380,9 +380,9 @@
   3 changesets pruned
 
   $ hg glog
-  @  20:fccc9de66799 added l
+  @  25:fccc9de66799 added l
   |   () draft
-  | o  17:3f2247835c1d added x
+  | o  21:3f2247835c1d added x
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -396,39 +396,39 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo foobar > l
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg up 3f2247835c1d
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo bar > x
   $ hg amend
   $ hg glog
-  @  25:cdf6547da25f added x
+  @  32:cdf6547da25f added x
   |   () draft
-  | o  24:3f371171d767 added l
+  | o  30:3f371171d767 added l
   |/    () draft
-  | o    23:7b78a9784f3e merged l and x
+  | o    28:7b78a9784f3e merged l and x
   | |\    () draft
-  +---x  20:fccc9de66799 added l
+  +---x  25:fccc9de66799 added l
   | |     () draft
-  | x  17:3f2247835c1d added x
+  | x  21:3f2247835c1d added x
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
 
 XXX: We should handle this case too
   $ hg evolve --all
-  move:[23] merged l and x
-  atop:[25] added x
-  move:[26] merged l and x
-  atop:[24] added l
+  move:[28] merged l and x
+  atop:[32] added x
+  move:[33] merged l and x
+  atop:[30] added l
   working directory is now at adb665a78e08
 
   $ hg glog
-  @    27:adb665a78e08 merged l and x
+  @    34:adb665a78e08 merged l and x
   |\    () draft
-  | o  25:cdf6547da25f added x
+  | o  32:cdf6547da25f added x
   | |   () draft
-  o |  24:3f371171d767 added l
+  o |  30:3f371171d767 added l
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -450,10 +450,10 @@
   +bar
 
   $ hg parents
-  changeset:   27:adb665a78e08
+  changeset:   34:adb665a78e08
   tag:         tip
-  parent:      24:3f371171d767
-  parent:      25:cdf6547da25f
+  parent:      30:3f371171d767
+  parent:      32:cdf6547da25f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merged l and x
@@ -464,26 +464,26 @@
 
   $ hg prune -r cdf6547da25f
   1 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
   $ hg glog
-  @    27:adb665a78e08 merged l and x
+  @    34:adb665a78e08 merged l and x
   |\    () draft
-  | x  25:cdf6547da25f added x
+  | x  32:cdf6547da25f added x
   | |   () draft
-  o |  24:3f371171d767 added l
+  o |  30:3f371171d767 added l
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
 
   $ hg evolve --rev .
-  move:[27] merged l and x
+  move:[34] merged l and x
   atop:[0] added hgignore
   working directory is now at fb8fe870ae7d
 
   $ hg glog
-  @    28:fb8fe870ae7d merged l and x
+  @    35:fb8fe870ae7d merged l and x
   |\    () draft
-  | o  24:3f371171d767 added l
+  | o  30:3f371171d767 added l
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -493,21 +493,21 @@
 --------------------------------------------------------------------------------
 
   $ hg glog
-  @    28:fb8fe870ae7d merged l and x
+  @    35:fb8fe870ae7d merged l and x
   |\    () draft
-  | o  24:3f371171d767 added l
+  | o  30:3f371171d767 added l
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
 
   $ hg prune -r 3f371171d767
   1 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
 
   $ hg glog
-  @    28:fb8fe870ae7d merged l and x
+  @    35:fb8fe870ae7d merged l and x
   |\    () draft
-  | x  24:3f371171d767 added l
+  | x  30:3f371171d767 added l
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -533,12 +533,12 @@
 point where the other parent of merge is the first non-pruned ancestor.
 
   $ hg evolve -r .
-  move:[28] merged l and x
+  move:[35] merged l and x
   atop:[0] added hgignore
   working directory is now at b61ba77b924a
 
   $ hg glog
-  @  29:b61ba77b924a merged l and x
+  @  36:b61ba77b924a merged l and x
   |   () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -563,21 +563,21 @@
   (branch merge, don't forget to commit)
   $ hg ci -m "merge commit"
   $ hg glog
-  @    31:32beb84b9dbc merge commit
+  @    38:32beb84b9dbc merge commit
   |\    () draft
-  | o  30:f3ba8b99bb6f added foo
+  | o  37:f3ba8b99bb6f added foo
   |     () draft
   o  0:8fa14d15e168 added hgignore
       () draft
 
   $ hg prune -r f3ba8b99bb6f
   1 changesets pruned
-  1 new orphan changesets
+  1 new unstable changesets
 
   $ hg glog
-  @    31:32beb84b9dbc merge commit
+  @    38:32beb84b9dbc merge commit
   |\    () draft
-  | x  30:f3ba8b99bb6f added foo
+  | x  37:f3ba8b99bb6f added foo
   |     () draft
   o  0:8fa14d15e168 added hgignore
       () draft
@@ -595,12 +595,12 @@
 just remove that chain.
 
   $ hg evolve -r .
-  move:[31] merge commit
+  move:[38] merge commit
   atop:[-1] 
   working directory is now at d2a03dd8c951
 
   $ hg glog
-  @  32:d2a03dd8c951 merge commit
+  @  39:d2a03dd8c951 merge commit
   |   () draft
   o  0:8fa14d15e168 added hgignore
       () draft