Mercurial > hg-stable
diff tests/test-graft.t @ 44725:16c361152133
graft: exit 1 on conflicts, like merge
It's more consistent, and makes it nicer to script around hg if you
don't have to ignore exit code 255, which is the error code for
basically everything in hg.
Differential Revision: https://phab.mercurial-scm.org/D8423
| author | Valentin Gatien-Baron <vgatien-baron@janestreet.com> |
|---|---|
| date | Tue, 14 Apr 2020 19:09:56 -0400 |
| parents | 6306baa7d19a |
| children | e5043679bfcc |
line wrap: on
line diff
--- a/tests/test-graft.t Fri Apr 10 19:58:34 2020 +0200 +++ b/tests/test-graft.t Tue Apr 14 19:09:56 2020 -0400 @@ -260,7 +260,7 @@ warning: conflicts while merging e! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') - [255] + [1] Summary should mention graft: @@ -317,7 +317,7 @@ warning: conflicts while merging e! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') - [255] + [1] Continue without resolve should fail: @@ -511,7 +511,7 @@ grafting 1:5d205f8b35b6 "1" abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') - [255] + [1] $ hg resolve --all merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') @@ -551,7 +551,7 @@ grafting 2:5c095ad7e90f "2" abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') - [255] + [1] $ hg resolve --all merging a and b to b (no more unresolved files) @@ -839,7 +839,7 @@ grafting 24:2e7ea477be26 "24" abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') - [255] + [1] $ hg resolve --all merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark')