Mercurial > public > mercurial-scm > hg

diff tests/test-bookmarks-pushpull.t @ 45908:122f0b59f5f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
errors: remove trailing "!" in messages about creating new heads on push Differential Revision: https://phab.mercurial-scm.org/D9380
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 23 Nov 2020 12:42:57 -0800
parents 95c4cca641f6
children f0626acf007d
line wrap: on
line diff
--- a/tests/test-bookmarks-pushpull.t	Mon Nov 23 12:31:53 2020 -0800
+++ b/tests/test-bookmarks-pushpull.t	Mon Nov 23 12:42:57 2020 -0800
@@ -740,7 +740,7 @@
   $ hg push http://localhost:$HGPORT2/
   pushing to http://localhost:$HGPORT2/
   searching for changes
-  abort: push creates new remote head c922c0139ca0 with bookmark 'Y'!
+  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
@@ -757,7 +757,7 @@
   $ hg push http://localhost:$HGPORT2/
   pushing to http://localhost:$HGPORT2/
   searching for changes
-  abort: push creates new remote head c922c0139ca0 with bookmark 'Y'!
+  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
@@ -1053,7 +1053,7 @@
   pushing to $TESTTMP/addmarks
   searching for changes
   remote has heads on branch 'default' that are not known locally: a2a606d9ff1b
-  abort: push creates new remote head 54694f811df9 with bookmark 'X'!
+  abort: push creates new remote head 54694f811df9 with bookmark 'X'
   (pull and merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ cd ../addmarks