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-phasediv.t
changeset 3772 6240579fd0c0
parent 3771 1f339d81aabd
child 3839 ac0717f23921 
--- a/tests/test-evolve-abort-phasediv.t	Thu May 24 00:58:35 2018 +0530
+++ b/tests/test-evolve-abort-phasediv.t	Thu May 24 00:58:50 2018 +0530
@@ -278,31 +278,28 @@
   [255]
 
   $ hg evolve --abort
+  1 new phase-divergent changesets
   evolve aborted
   working directory is now at ef9b72b9b42c
 
   $ hg glog --hidden
-  o  11:95d746965290 phase-divergent update to ca1b80f7960a:
-  |
-  |  added c
+  @  10:ef9b72b9b42c added d
   |   () draft
-  | @  10:ef9b72b9b42c added d
-  | |   () draft
-  | | x  9:28cd06b3f801 added c
-  | |/    () draft
-  | | x  8:9ff8adbe8a24 added c
-  | |/    () draft
-  | | x  7:e44ebefe4f54 added d
-  | |/    () draft
-  | | x  6:ddba58020bc0 added d
-  | |/    () draft
-  | | x  5:cfe30edc6125 added d
-  | |/    () draft
-  +---o  4:c41c793e0ef1 added d
-  | |     () public
-  o |  3:ca1b80f7960a added c
+  | *  9:28cd06b3f801 added c
+  |/    () draft
+  | x  8:9ff8adbe8a24 added c
+  |/    () draft
+  | x  7:e44ebefe4f54 added d
+  |/    () draft
+  | x  6:ddba58020bc0 added d
+  |/    () draft
+  | x  5:cfe30edc6125 added d
+  |/    () draft
+  | o  4:c41c793e0ef1 added d
   | |   () public
-  o |  2:b1661037fa25 added b
+  | o  3:ca1b80f7960a added c
+  | |   () public
+  | o  2:b1661037fa25 added b
   |/    () public
   o  1:c7586e2a9264 added a
   |   () public
evolve