Mercurial > hg

diff tests/test-issue1502.t @ 26968:216cc65cf227

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: return 255 value on update failure (issue4948) (BC) Before this patch hg pull -u on UpdateAbort error returned 0 value to the system. This patch fixes this by reraising UpdateAbort with updated error msg.
author liscju <piotr.listkiewicz@gmail.com>
date Sun, 15 Nov 2015 22:58:28 +0100
parents 2fc86d92c4a9
children 9e0535da20a5
line wrap: on
line diff
--- a/tests/test-issue1502.t	Wed Nov 11 10:19:11 2015 -0800
+++ b/tests/test-issue1502.t	Sun Nov 15 22:58:28 2015 +0100
@@ -19,8 +19,9 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  not updating: not a linear update
+  abort: not updating: not a linear update
   (merge or update --check to force update)
+  [255]
 
   $ hg -R foo1 book branchy
   $ hg -R foo1 book