Mercurial > public > mercurial-scm > hg

diff tests/test-bookmarks-pushpull.t @ 22651:b901645a8784

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push: gather all bookmark decisions together The discovery phases for bookmarks now use the list of explicitly pushed bookmarks to do addition, removal and overwriting. Tests are impacted because this reduces the amount of listkeys calls issued, removes some duplicated messages and improves the accuracy of some messages.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sat, 27 Sep 2014 20:51:53 -0700
parents 7a9cbb315d84
children 798185707833
line wrap: on
line diff
--- a/tests/test-bookmarks-pushpull.t	Fri Sep 26 18:33:11 2014 -0700
+++ b/tests/test-bookmarks-pushpull.t	Sat Sep 27 20:51:53 2014 -0700
@@ -99,8 +99,8 @@
   $ hg push -B badname ../a
   pushing to ../a
   searching for changes
+  bookmark badname does not exist on the local or remote repository!
   no changes found
-  bookmark badname does not exist on the local or remote repository!
   [2]
   $ hg pull -B anotherbadname ../a
   pulling from ../a
@@ -356,7 +356,7 @@
   pushing to http://localhost:$HGPORT/
   searching for changes
   no changes found
-  exporting bookmark Z
+  updating bookmark Z
   [1]
   $ hg book -d Z
   $ hg in -B http://localhost:$HGPORT/