Mercurial > public > mercurial-scm > hg

diff tests/test-bookmarks-pushpull.t @ 25501:a99fee62611d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: abort the whole push if bookmarks fails to update (BC) When using bundle2, the bookmark's pushkey parts are now made mandatory. As a result failure to update the bookmark server side will result in the transaction being aborted.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 27 May 2015 22:25:33 -0700
parents c63bf97cf7c7
children 1aee2ab0f902
line wrap: on
line diff
--- a/tests/test-bookmarks-pushpull.t	Mon Jun 08 16:55:21 2015 -0700
+++ b/tests/test-bookmarks-pushpull.t	Wed May 27 22:25:33 2015 -0700
@@ -755,8 +755,8 @@
   searching for changes
   no changes found
   pushkey-abort: prepushkey hook exited with status 1
-  exporting bookmark @ failed!
-  [1]
+  abort: exporting bookmark @ failed!
+  [255]
   $ hg -R ../issue4455-dest/ bookmarks
   no bookmarks set
 
@@ -768,8 +768,8 @@
   searching for changes
   no changes found
   remote: pushkey-abort: prepushkey hook exited with status 1
-  exporting bookmark @ failed!
-  [1]
+  abort: exporting bookmark @ failed!
+  [255]
   $ hg -R ../issue4455-dest/ bookmarks
   no bookmarks set
 
@@ -791,8 +791,8 @@
   searching for changes
   no changes found
   remote: pushkey-abort: prepushkey hook exited with status 1
-  exporting bookmark @ failed!
-  [1]
+  abort: exporting bookmark @ failed!
+  [255]
   $ hg -R ../issue4455-dest/ bookmarks
   no bookmarks set