Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-abort-orphan.t
branchmercurial-4.3
changeset 4174 e07e764c0f48
parent 4002 21eab0a99841
parent 4173 e268f7fd7839 
--- a/tests/test-evolve-abort-orphan.t	Fri Oct 12 15:15:09 2018 +0200
+++ b/tests/test-evolve-abort-orphan.t	Fri Oct 12 15:20:54 2018 +0200
@@ -78,18 +78,18 @@
   $ echo babar > d
   $ hg add d
   $ hg amend
-  1 new orphan changesets
+  1 new unstable changesets
 
   $ hg evolve --all
   move:[4] added d
-  atop:[5] added c
+  atop:[6] added c
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   fix conflicts and see `hg help evolve.interrupted`
   [1]
 
   $ hg parents
-  changeset:   5:e93a9161a274
+  changeset:   6:e93a9161a274
   tag:         tip
   parent:      2:b1661037fa25
   user:        test
@@ -99,7 +99,7 @@
   changeset:   4:c41c793e0ef1
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  instability: orphan
+  trouble:     unstable
   summary:     added d
   
 
@@ -108,7 +108,7 @@
   working directory is now at e93a9161a274
 
   $ hg glog
-  @  5:e93a9161a274 added c
+  @  6:e93a9161a274 added c
   |   () draft
   | o  4:c41c793e0ef1 added d
   | |   () draft
@@ -129,7 +129,7 @@
 
   $ hg evolve --all
   move:[4] added d
-  atop:[5] added c
+  atop:[6] added c
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   fix conflicts and see `hg help evolve.interrupted`
@@ -151,12 +151,12 @@
   $ echo bar > c
   $ hg add c
   $ hg amend
-  3 new orphan changesets
+  3 new unstable changesets
 
   $ hg evolve --all
   move:[2] added b
-  atop:[7] added a
-  move:[5] added c
+  atop:[9] added a
+  move:[6] added c
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   fix conflicts and see `hg help evolve.interrupted`
@@ -166,28 +166,15 @@
   $ hg status -v
   M c
   A d
-  # The repository is in an unfinished *evolve* state.
-  
-  # Unresolved merge conflicts:
-  # 
-  #     c
-  # 
-  # 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 glog
-  @  8:0c41ec482070 added b
+  @  10:0c41ec482070 added b
   |   () draft
-  o  7:125af0ed8cae added a
+  o  9:125af0ed8cae added a
   |   () draft
-  | o  6:e83de241f751 added d
+  | o  7:e83de241f751 added d
   | |   () draft
-  | @  5:e93a9161a274 added c
+  | @  6:e93a9161a274 added c
   | |   () draft
   | x  2:b1661037fa25 added b
   | |   () draft
@@ -201,11 +188,11 @@
   working directory is now at 125af0ed8cae
 
   $ hg glog
-  @  7:125af0ed8cae added a
+  @  9:125af0ed8cae added a
   |   () draft
-  | o  6:e83de241f751 added d
+  | o  7:e83de241f751 added d
   | |   () draft
-  | o  5:e93a9161a274 added c
+  | o  6:e93a9161a274 added c
   | |   () draft
   | o  2:b1661037fa25 added b
   | |   () draft
@@ -258,26 +245,26 @@
   [1] added a
   $ echo aa > a
   $ hg amend
-  5 new orphan changesets
+  5 new unstable changesets
 
   $ hg evolve --all
   move:[2] added b
-  atop:[7] added a
+  atop:[8] added a
   move:[4] added c
-  atop:[7] added a
+  atop:[8] added a
   move:[6] foo to a
-  atop:[7] added a
+  atop:[8] added a
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   fix conflicts and see `hg help evolve.interrupted`
   [1]
 
   $ hg glog
-  o  9:7f8e8bd9f0b6 added c
+  o  10:7f8e8bd9f0b6 added c
   |   () draft
-  | o  8:db3b42ef4da7 added b
+  | o  9:db3b42ef4da7 added b
   |/    () draft
-  @  7:807e8e2ca559 added a
+  @  8:807e8e2ca559 added a
   |   () draft
   | @  6:8f20d4390c21 foo to a
   | |   () draft
@@ -299,7 +286,7 @@
   working directory is now at 807e8e2ca559
 
   $ hg glog
-  @  7:807e8e2ca559 added a
+  @  8:807e8e2ca559 added a
   |   () draft
   | o  6:8f20d4390c21 foo to a
   | |   () draft
@@ -325,21 +312,21 @@
 
   $ hg evolve --all
   move:[2] added b
-  atop:[7] added a
+  atop:[8] added a
   move:[4] added c
-  atop:[7] added a
+  atop:[8] added a
   move:[6] foo to a
-  atop:[7] added a
+  atop:[8] added a
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   fix conflicts and see `hg help evolve.interrupted`
   [1]
   $ hg glog
-  o  9:7f8e8bd9f0b6 added c
+  o  10:7f8e8bd9f0b6 added c
   |   () draft
-  | o  8:db3b42ef4da7 added b
+  | o  9:db3b42ef4da7 added b
   |/    () draft
-  @  7:807e8e2ca559 added a
+  @  8:807e8e2ca559 added a
   |   () draft
   | @  6:8f20d4390c21 foo to a
   | |   () draft
@@ -371,7 +358,7 @@
   adding manifests
   adding file changes
   added 10 changesets with 8 changes to 5 files (+4 heads)
-  3 new obsolescence markers
+  4 new obsolescence markers
   $ cd ../clonerepo
   $ hg up 7f8e8bd9f0b6
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -401,28 +388,28 @@
 
   $ hg evolve --all
   move:[3] added c
-  atop:[8] added b
+  atop:[9] added b
   move:[5] added d
-  atop:[9] added c
+  atop:[10] added c
   move:[6] foo to a
-  atop:[7] added a
+  atop:[8] added a
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   fix conflicts and see `hg help evolve.interrupted`
   [1]
 
   $ hg glog
-  o  12:1c476940790a added d
+  o  13:1c476940790a added d
   |   () draft
-  | o  11:c10a55eb0cc6 added c
+  | o  12:c10a55eb0cc6 added c
   | |   () draft
-  +---o  10:48eca1ed5478 made an new commit on evolved rev
+  +---o  11:48eca1ed5478 made an new commit on evolved rev
   | |     () draft
-  o |  9:7f8e8bd9f0b6 added c
+  o |  10:7f8e8bd9f0b6 added c
   | |   () draft
-  | o  8:db3b42ef4da7 added b
+  | o  9:db3b42ef4da7 added b
   |/    () draft
-  @  7:807e8e2ca559 added a
+  @  8:807e8e2ca559 added a
   |   () draft
   | @  6:8f20d4390c21 foo to a
   | |   () draft
@@ -463,10 +450,10 @@
   $ echo foo > c
   $ hg add c
   $ hg amend
-  2 new orphan changesets
+  2 new unstable changesets
 
   $ hg glog
-  @  4:a0086c17bfc7 added a
+  @  5:a0086c17bfc7 added a
   |   () draft
   | o  3:17509928e5bf added c
   | |   () draft
@@ -479,7 +466,7 @@
 
   $ hg evolve --all
   move:[2] added b
-  atop:[4] added a
+  atop:[5] added a
   move:[3] added c
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
@@ -487,9 +474,9 @@
   [1]
 
   $ hg glog
-  @  5:c1f4718020e3 added b
+  @  6:c1f4718020e3 added b
   |   (bm1) draft
-  o  4:a0086c17bfc7 added a
+  o  5:a0086c17bfc7 added a
   |   () draft
   | @  3:17509928e5bf added c
   | |   () draft
@@ -505,7 +492,7 @@
   working directory is now at a0086c17bfc7
 
   $ hg glog
-  @  4:a0086c17bfc7 added a
+  @  5:a0086c17bfc7 added a
   |   () draft
   | o  3:17509928e5bf added c
   | |   () draft
@@ -521,11 +508,11 @@
 
   $ hg next --evolve
   move:[2] added b
-  atop:[4] added a
+  atop:[5] added a
   working directory now at c1f4718020e3
   $ hg next --evolve
   move:[3] added c
-  atop:[5] added b
+  atop:[6] added b
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   fix conflicts and see `hg help evolve.interrupted`
evolve