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-contentdiv.t
branchmercurial-4.4
changeset 3930 d00f0c369bc7
parent 3909 f7afd3a158e3
child 3936 537fd9a86c06
child 3995 684cc3418ecd 
--- a/tests/test-evolve-abort-contentdiv.t	Thu Aug 02 02:42:15 2018 +0200
+++ b/tests/test-evolve-abort-contentdiv.t	Thu Aug 02 02:47:44 2018 +0200
@@ -45,8 +45,6 @@
   $ hg amend
 
   $ hg up c41c793e0ef1 --hidden
-  updating to a hidden changeset c41c793e0ef1
-  (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (c41c793e0ef1)
   (use 'hg evolve' to update to its successor: e49523854bc8)
@@ -57,7 +55,7 @@
   $ hg glog --hidden
   @  6:9c1631e352d9 added d
   |   () draft
-  | *  5:e49523854bc8 added d
+  | o  5:e49523854bc8 added d
   |/    () draft
   | x  4:c41c793e0ef1 added d
   |/    () draft
@@ -104,7 +102,7 @@
   $ hg glog --hidden
   @  6:9c1631e352d9 added d
   |   () draft
-  | *  5:e49523854bc8 added d
+  | o  5:e49523854bc8 added d
   |/    () draft
   | x  4:c41c793e0ef1 added d
   |/    () draft
@@ -143,13 +141,13 @@
   |   () draft
   | x  9:7398f702a162 added c
   |/    () draft
-  | *  8:2ba73e31f264 added c
+  | o  8:2ba73e31f264 added c
   |/    () draft
-  | *  7:f0f1694f123e added d
+  | o  7:f0f1694f123e added d
   | |   () draft
   | | x  6:9c1631e352d9 added d
   | |/    () draft
-  | | *  5:e49523854bc8 added d
+  | | o  5:e49523854bc8 added d
   | |/    () draft
   | | x  4:c41c793e0ef1 added d
   | |/    () draft
@@ -181,7 +179,6 @@
   [1]
 
   $ hg evolve --abort
-  2 new content-divergent changesets
   evolve aborted
   working directory is now at 491e10505bae
 
@@ -190,13 +187,13 @@
   |   () draft
   | x  9:7398f702a162 added c
   |/    () draft
-  | *  8:2ba73e31f264 added c
+  | o  8:2ba73e31f264 added c
   |/    () draft
-  | *  7:f0f1694f123e added d
+  | o  7:f0f1694f123e added d
   | |   () draft
   | | x  6:9c1631e352d9 added d
   | |/    () draft
-  | | *  5:e49523854bc8 added d
+  | | o  5:e49523854bc8 added d
   | |/    () draft
   | | x  4:c41c793e0ef1 added d
   | |/    () draft
@@ -210,7 +207,7 @@
       () draft
 
   $ hg obslog -r . --all
-  *  2ba73e31f264 (8) added c
+  o  2ba73e31f264 (8) added c
   |
   | @  491e10505bae (10) added c
   | |
@@ -253,8 +250,6 @@
   $ hg amend
 
   $ hg up --hidden c41c793e0ef1
-  updating to a hidden changeset c41c793e0ef1
-  (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d)
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (c41c793e0ef1)
   (use 'hg evolve' to update to its successor: 69bdd23a9b0d)
@@ -265,7 +260,7 @@
   $ hg glog
   @  7:e49523854bc8 added d
   |   () draft
-  | *  6:69bdd23a9b0d added d
+  | o  6:69bdd23a9b0d added d
   | |   () draft
   o |  3:ca1b80f7960a added c
   | |   () draft
@@ -293,7 +288,7 @@
   $ hg glog
   @  7:e49523854bc8 added d
   |   () draft
-  | *  6:69bdd23a9b0d added d
+  | o  6:69bdd23a9b0d added d
   | |   () draft
   o |  3:ca1b80f7960a added c
   | |   () draft
@@ -317,7 +312,7 @@
   $ hg glog
   @  8:33e4442acf98 added d
   |   () draft
-  | *  7:e49523854bc8 added d
+  | o  7:e49523854bc8 added d
   | |   () draft
   | o  3:ca1b80f7960a added c
   | |   () draft
@@ -348,7 +343,7 @@
   $ hg glog
   @  8:33e4442acf98 added d
   |   () draft
-  | *  7:e49523854bc8 added d
+  | o  7:e49523854bc8 added d
   | |   () draft
   | o  3:ca1b80f7960a added c
   | |   () draft
evolve