Mercurial > public > mercurial-scm > hg
diff tests/test-bookmarks-pushpull.t @ 46119:9261f6c1d39b
errors: raise StateError when push fails because it creates new heads
I decided to raise `StateError` here because the local and remote
repos are in an incompatible state. I think remote errors (exit code
100) should be when something goes wrong on the remote and there's
nothing the user can do.
Differential Revision: https://phab.mercurial-scm.org/D9391
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 23 Nov 2020 16:39:53 -0800 |
| parents | f0626acf007d |
| children | 768056549737 |
line wrap: on
line diff
--- a/tests/test-bookmarks-pushpull.t Mon Nov 23 10:38:05 2020 -0800 +++ b/tests/test-bookmarks-pushpull.t Mon Nov 23 16:39:53 2020 -0800 @@ -742,7 +742,7 @@ searching for changes abort: push creates new remote head c922c0139ca0 with bookmark 'Y' (merge or see 'hg help push' for details about pushing new heads) - [255] + [20] $ hg -R ../a book @ 1:0d2164f0ce0d * X 1:0d2164f0ce0d @@ -759,7 +759,7 @@ searching for changes abort: push creates new remote head c922c0139ca0 with bookmark 'Y' (merge or see 'hg help push' for details about pushing new heads) - [255] + [20] $ hg -R ../a book @ 1:0d2164f0ce0d * X 1:0d2164f0ce0d @@ -1055,7 +1055,7 @@ remote has heads on branch 'default' that are not known locally: a2a606d9ff1b 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] + [20] $ cd ../addmarks Check summary output for incoming/outgoing bookmarks