Mercurial > hg-stable

diff tests/test-bookmarks-pushpull.t @ 21580:32601b0b74c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
discovery: if a push would create a new head, mention the bookmark name if any
author Stephen Lee <sphen.lee@gmail.com>
date Sat, 08 Mar 2014 19:02:39 +1100
parents ca275f7ec576
children 7a9cbb315d84
line wrap: on
line diff
--- a/tests/test-bookmarks-pushpull.t	Wed May 14 10:38:05 2014 -0700
+++ b/tests/test-bookmarks-pushpull.t	Sat Mar 08 19:02:39 2014 +1100
@@ -274,7 +274,7 @@
   $ hg push http://localhost:$HGPORT2/
   pushing to http://localhost:$HGPORT2/
   searching for changes
-  abort: push creates new remote head c922c0139ca0!
+  abort: push creates new remote head c922c0139ca0 with bookmark 'Y'!
   (merge or see "hg help push" for details about pushing new heads)
   [255]
   $ hg -R ../a book
@@ -290,7 +290,7 @@
   $ hg push http://localhost:$HGPORT2/
   pushing to http://localhost:$HGPORT2/
   searching for changes
-  abort: push creates new remote head c922c0139ca0!
+  abort: push creates new remote head c922c0139ca0 with bookmark 'Y'!
   (merge or see "hg help push" for details about pushing new heads)
   [255]
   $ hg -R ../a book