Mercurial > hg-stable
diff tests/test-push-warn.t @ 12316:4134686b83e1
tests: add exit codes to unified tests
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 16 Sep 2010 17:51:32 -0500 |
parents | 28e2e3804f2e |
children | b63f6422d2a7 |
line wrap: on
line diff
--- a/tests/test-push-warn.t Thu Sep 16 16:12:26 2010 -0500 +++ b/tests/test-push-warn.t Thu Sep 16 17:51:32 2010 -0500 @@ -28,6 +28,7 @@ searching for changes abort: push creates new remote heads on branch 'default'! (you should pull and merge or use push -f to force) + [255] $ hg pull ../a pulling from ../a @@ -43,6 +44,7 @@ searching for changes abort: push creates new remote heads on branch 'default'! (did you forget to merge? use push -f to force) + [255] $ hg merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -139,6 +141,7 @@ comparing with ../c searching for changes no changes found + [1] Issue 450: @@ -315,6 +318,7 @@ $ echo 12 > foo $ hg -q ci -m 12a + [1] $ hg -q up 11 $ echo 13 > foo $ hg -q branch e @@ -372,6 +376,7 @@ searching for changes abort: push creates new remote heads on branch 'default'! (you should pull and merge or use push -f to force) + [255] Check prepush logic with merged branches: @@ -405,6 +410,7 @@ searching for changes abort: push creates new remote branches: b! (use 'hg push --new-branch' to create new remote branches) + [255] Prepush -r should not allow you to sneak in new heads: @@ -440,6 +446,7 @@ searching for changes abort: push creates new remote heads on branch 'a'! (did you forget to merge? use push -f to force) + [255] $ cd .. @@ -685,17 +692,20 @@ searching for changes abort: push creates new remote heads on branch 'A'! (did you forget to merge? use push -f to force) + [255] $ hg push inner -r4 -r5 pushing to inner searching for changes abort: push creates new remote heads on branch 'A'! (did you forget to merge? use push -f to force) + [255] $ hg in inner comparing with inner searching for changes no changes found + [1] $ cd ..