Mercurial > public > mercurial-scm > hg-stable

diff tests/test-hgweb-commands.t @ 23505:bd5dbb8a05c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: show more useful status information while grafting Show status messages with first line of commit description and names, like grafting 12:2647734878ef "fork" (tip) This gives more context for the user when resolving conflicts.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 09 Dec 2014 03:38:23 +0100
parents c00b156d6e76
children 70cfa7e1611b
line wrap: on
line diff
--- a/tests/test-hgweb-commands.t	Tue Dec 09 03:37:55 2014 +0100
+++ b/tests/test-hgweb-commands.t	Tue Dec 09 03:38:23 2014 +0100
@@ -2201,12 +2201,12 @@
   $ hg ci -m 'Babar is in the jungle!'
   created new head
   $ hg graft 0::
-  grafting revision 0
-  grafting revision 1
-  grafting revision 2
-  grafting revision 3
-  grafting revision 4
-  grafting revision 5
+  grafting 0:b4e73ffab476 "0"
+  grafting 1:e06180cbfb0c "1"
+  grafting 2:ab4f1438558b "2"
+  grafting 3:ada793dcc118 "3"
+  grafting 4:b60a39a85a01 "4" (secret)
+  grafting 5:aed2d9c1d0e7 "5"
 (turning the initial root secret (filtered))
   $ hg phase --force --secret 0
   $ PATH_INFO=/graph/; export PATH_INFO