diff tests/test-grab.t @ 4363:a2fdbece7ce1 mercurial-4.4

test-compat: merge mercurial-4.5 into mercurial-4.4
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 22 Jan 2019 12:57:25 -0500
parents b4ffdeb2afd8 424b498aac00
children
line wrap: on
line diff
--- a/tests/test-grab.t	Tue Jan 22 12:55:09 2019 -0500
+++ b/tests/test-grab.t	Tue Jan 22 12:57:25 2019 -0500
@@ -107,7 +107,6 @@
 
   $ hg pick 7c3bad9141dc
   picking 1:7c3bad9141dc "add b"
-  1 new orphan changesets
   $ hg glog
   @  5:7c15c05db6fa add b
   |
@@ -115,7 +114,7 @@
   |
   o  3:8e224524cd09 add x
   |
-  | *  2:4538525df7e2 add c
+  | o  2:4538525df7e2 add c
   | |
   | x  1:7c3bad9141dc add b
   |/
@@ -136,7 +135,7 @@
   |
   o  3:8e224524cd09 add x
   |
-  | *  2:4538525df7e2 add c
+  | o  2:4538525df7e2 add c
   | |
   | x  1:7c3bad9141dc add b
   |/
@@ -220,11 +219,8 @@
   $ echo foo > b
   $ hg ci -Aqm "foo to b"
   $ hg glog -r .^::
-  @  10:c437988de89f foo to b
-  |
-  o  8:44e155eb95c7 add c
-  |
-  ~
+  hg: parse error at 4: not a prefix: end
+  [255]
 
   $ hg pick -r 7c15c05db6fa
   picking 5:7c15c05db6fa "add b"