diff tests/test-evolve-abort-contentdiv.t @ 4082:185770c10a4e mercurial-4.3

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

--- a/tests/test-evolve-abort-contentdiv.t	Mon Sep 03 22:59:19 2018 +0200
+++ b/tests/test-evolve-abort-contentdiv.t	Mon Sep 03 22:59:20 2018 +0200
@@ -51,12 +51,16 @@
 
   $ echo foobar > d
   $ hg amend
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ hg glog --hidden
-  @  6:9c1631e352d9 added d
+  @  8:9c1631e352d9 added d
   |   () draft
-  | o  5:e49523854bc8 added d
-  |/    () draft
+  | x  7:48ce7f604829 temporary amend commit for c41c793e0ef1
+  | |   () draft
+  +---o  6:e49523854bc8 added d
+  | |     () draft
+  | | x  5:14721514d41c temporary amend commit for c41c793e0ef1
+  | |/    () draft
   | x  4:c41c793e0ef1 added d
   |/    () draft
   o  3:ca1b80f7960a added c
@@ -69,10 +73,10 @@
       () draft
 
   $ hg evolve --content-divergent
-  merge:[6] added d
-  with: [5] added d
+  merge:[8] added d
+  with: [6] added d
   base: [4] added d
-  merging "other" content-divergent changeset 'e49523854bc8'
+  merging "other" divergent changeset 'e49523854bc8'
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -81,45 +85,20 @@
 
   $ hg status -v
   M d
-  # The repository is in an unfinished *evolve* state.
-  
-  # Unresolved merge conflicts:
-  # 
-  #     d
-  # 
-  # To mark files as resolved:  hg resolve --mark FILE
-  
-  # To continue:    hg evolve --continue
-  # To abort:       hg evolve --abort
-  # To stop:        hg evolve --stop
-  # (also see `hg help evolve.interrupted`)
-  
-  $ hg parents
-  changeset:   6:9c1631e352d9
-  tag:         tip
-  parent:      3:ca1b80f7960a
-  user:        test
-  date:        Thu Jan 01 00:00:00 1970 +0000
-  instability: content-divergent
-  summary:     added d
-  
-  changeset:   5:e49523854bc8
-  parent:      3:ca1b80f7960a
-  user:        test
-  date:        Thu Jan 01 00:00:00 1970 +0000
-  instability: content-divergent
-  summary:     added d
-  
 
   $ hg evolve --abort
   evolve aborted
   working directory is now at 9c1631e352d9
 
   $ hg glog --hidden
-  @  6:9c1631e352d9 added d
+  @  8:9c1631e352d9 added d
   |   () draft
-  | o  5:e49523854bc8 added d
-  |/    () draft
+  | x  7:48ce7f604829 temporary amend commit for c41c793e0ef1
+  | |   () draft
+  +---o  6:e49523854bc8 added d
+  | |     () draft
+  | | x  5:14721514d41c temporary amend commit for c41c793e0ef1
+  | |/    () draft
   | x  4:c41c793e0ef1 added d
   |/    () draft
   o  3:ca1b80f7960a added c
@@ -141,30 +120,42 @@
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo bar > c
   $ hg amend
-  2 new orphan changesets
+  2 new unstable changesets
   $ hg up ca1b80f7960a --hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (ca1b80f7960a)
   (use 'hg evolve' to update to its successor: 2ba73e31f264)
   $ echo foobar > c
   $ hg amend
-  2 new content-divergent changesets
+  2 new divergent changesets
   $ echo bar > c
   $ hg amend
 
   $ hg glog --hidden
-  @  10:491e10505bae added c
+  @  16:491e10505bae added c
   |   () draft
-  | x  9:7398f702a162 added c
-  |/    () draft
-  | o  8:2ba73e31f264 added c
+  | x  15:b2451992ec73 temporary amend commit for 7398f702a162
+  | |   () draft
+  | x  14:7398f702a162 added c
   |/    () draft
-  | o  7:f0f1694f123e added d
+  | x  13:1c0d5c8e745f temporary amend commit for ca1b80f7960a
   | |   () draft
-  | | x  6:9c1631e352d9 added d
+  +---o  12:2ba73e31f264 added c
+  | |     () draft
+  | | x  11:277fdfc7d90c temporary amend commit for ca1b80f7960a
+  | |/    () draft
+  | | o  10:f0f1694f123e added d
   | |/    () draft
-  | | o  5:e49523854bc8 added d
+  | | x  9:36f1dead57ef temporary amend commit for 9c1631e352d9
+  | | |   () draft
+  | | x  8:9c1631e352d9 added d
   | |/    () draft
+  | | x  7:48ce7f604829 temporary amend commit for c41c793e0ef1
+  | | |   () draft
+  | +---o  6:e49523854bc8 added d
+  | | |     () draft
+  | | | x  5:14721514d41c temporary amend commit for c41c793e0ef1
+  | | |/    () draft
   | | x  4:c41c793e0ef1 added d
   | |/    () draft
   | x  3:ca1b80f7960a added c
@@ -177,17 +168,17 @@
       () draft
 
   $ hg evolve --all --content-divergent
-  merge:[8] added c
-  with: [10] added c
+  merge:[12] added c
+  with: [16] added c
   base: [3] added c
   updating to "local" side of the conflict: 2ba73e31f264
-  merging "other" content-divergent changeset '491e10505bae'
+  merging "other" divergent changeset '491e10505bae'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  merge:[5] added d
-  with: [7] added d
+  merge:[6] added d
+  with: [10] added d
   base: [4] added d
   updating to "local" side of the conflict: e49523854bc8
-  merging "other" content-divergent changeset 'f0f1694f123e'
+  merging "other" divergent changeset 'f0f1694f123e'
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -199,18 +190,30 @@
   working directory is now at 491e10505bae
 
   $ hg glog --hidden
-  @  10:491e10505bae added c
+  @  16:491e10505bae added c
   |   () draft
-  | x  9:7398f702a162 added c
-  |/    () draft
-  | o  8:2ba73e31f264 added c
+  | x  15:b2451992ec73 temporary amend commit for 7398f702a162
+  | |   () draft
+  | x  14:7398f702a162 added c
   |/    () draft
-  | o  7:f0f1694f123e added d
+  | x  13:1c0d5c8e745f temporary amend commit for ca1b80f7960a
   | |   () draft
-  | | x  6:9c1631e352d9 added d
+  +---o  12:2ba73e31f264 added c
+  | |     () draft
+  | | x  11:277fdfc7d90c temporary amend commit for ca1b80f7960a
+  | |/    () draft
+  | | o  10:f0f1694f123e added d
   | |/    () draft
-  | | o  5:e49523854bc8 added d
+  | | x  9:36f1dead57ef temporary amend commit for 9c1631e352d9
+  | | |   () draft
+  | | x  8:9c1631e352d9 added d
   | |/    () draft
+  | | x  7:48ce7f604829 temporary amend commit for c41c793e0ef1
+  | | |   () draft
+  | +---o  6:e49523854bc8 added d
+  | | |     () draft
+  | | | x  5:14721514d41c temporary amend commit for c41c793e0ef1
+  | | |/    () draft
   | | x  4:c41c793e0ef1 added d
   | |/    () draft
   | x  3:ca1b80f7960a added c
@@ -223,16 +226,16 @@
       () draft
 
   $ hg obslog -r . --all
-  o  2ba73e31f264 (8) added c
+  o  2ba73e31f264 (12) added c
   |
-  | @  491e10505bae (10) added c
+  | @  491e10505bae (16) added c
   | |
-  | x  7398f702a162 (9) added c
-  |/     rewritten(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  | x  7398f702a162 (14) added c
+  |/     rewritten(content) as 491e10505bae by test (Thu Jan 01 00:00:00 1970 +0000)
   |
   x  ca1b80f7960a (3) added c
-       rewritten(content) as 2ba73e31f264 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
-       rewritten(content) as 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+       rewritten(content) as 2ba73e31f264 by test (Thu Jan 01 00:00:00 1970 +0000)
+       rewritten(content) as 7398f702a162 by test (Thu Jan 01 00:00:00 1970 +0000)
   
   $ cd ..
 
@@ -271,12 +274,12 @@
   (use 'hg evolve' to update to its successor: 69bdd23a9b0d)
   $ echo bar > d
   $ hg amend
-  2 new content-divergent changesets
+  2 new divergent changesets
 
   $ hg glog
-  @  7:e49523854bc8 added d
+  @  9:e49523854bc8 added d
   |   () draft
-  | o  6:69bdd23a9b0d added d
+  | o  7:69bdd23a9b0d added d
   | |   () draft
   o |  3:ca1b80f7960a added c
   | |   () draft
@@ -288,8 +291,8 @@
       () draft
 
   $ hg evolve --content-divergent
-  merge:[7] added d
-  with: [6] added d
+  merge:[9] added d
+  with: [7] added d
   base: [4] added d
   rebasing "other" content-divergent changeset 69bdd23a9b0d on ca1b80f7960a
   merging c
@@ -302,9 +305,9 @@
   working directory is now at e49523854bc8
 
   $ hg glog
-  @  7:e49523854bc8 added d
+  @  9:e49523854bc8 added d
   |   () draft
-  | o  6:69bdd23a9b0d added d
+  | o  7:69bdd23a9b0d added d
   | |   () draft
   o |  3:ca1b80f7960a added c
   | |   () draft
@@ -326,9 +329,9 @@
   $ hg amend
 
   $ hg glog
-  @  8:33e4442acf98 added d
+  @  11:33e4442acf98 added d
   |   () draft
-  | o  7:e49523854bc8 added d
+  | o  9:e49523854bc8 added d
   | |   () draft
   | o  3:ca1b80f7960a added c
   | |   () draft
@@ -340,12 +343,12 @@
       () draft
 
   $ hg evolve --content-divergent
-  merge:[7] added d
-  with: [8] added d
+  merge:[9] added d
+  with: [11] added d
   base: [4] added d
   rebasing "other" content-divergent changeset 33e4442acf98 on ca1b80f7960a
   updating to "local" side of the conflict: e49523854bc8
-  merging "other" content-divergent changeset 'a663d1567f0b'
+  merging "other" divergent changeset 'a663d1567f0b'
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -357,9 +360,9 @@
   working directory is now at 33e4442acf98
 
   $ hg glog
-  @  8:33e4442acf98 added d
+  @  11:33e4442acf98 added d
   |   () draft
-  | o  7:e49523854bc8 added d
+  | o  9:e49523854bc8 added d
   | |   () draft
   | o  3:ca1b80f7960a added c
   | |   () draft