Mercurial > hg
diff tests/test-graft-interrupted.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 | 14d0e89520a2 |
children | 7d494425167c |
line wrap: on
line diff
--- a/tests/test-graft-interrupted.t Fri Apr 10 19:58:34 2020 +0200 +++ b/tests/test-graft-interrupted.t Tue Apr 14 19:09:56 2020 -0400 @@ -32,7 +32,7 @@ warning: conflicts while merging b! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') - [255] + [1] Writing the nodes in old format to graftstate @@ -91,7 +91,7 @@ warning: conflicts while merging b! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') - [255] + [1] $ echo wat > b $ hg resolve -m @@ -141,7 +141,7 @@ warning: conflicts while merging b! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') - [255] + [1] $ echo foobar > b $ hg resolve -m @@ -180,7 +180,7 @@ warning: conflicts while merging b! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') - [255] + [1] $ echo foobar > b $ hg resolve -m @@ -246,7 +246,7 @@ warning: conflicts while merging d! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') - [255] + [1] $ hg graft --stop --continue abort: cannot use '--continue' and '--stop' together @@ -283,7 +283,7 @@ warning: conflicts while merging d! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') - [255] + [1] $ hg graft --stop stopped the interrupted graft @@ -352,7 +352,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') - [255] + [1] $ hg graft --continue --abort abort: cannot use '--continue' and '--abort' together @@ -399,7 +399,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') - [255] + [1] $ hg abort graft aborted @@ -426,7 +426,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') - [255] + [1] $ hg log -GT "{rev}:{node|short} {desc}" @ 6:6ec71c037d94 added x @@ -488,7 +488,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') - [255] + [1] $ cd .. $ hg init pullrepo @@ -609,7 +609,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') - [255] + [1] Resolve conflict: $ echo A>a @@ -648,7 +648,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') - [255] + [1] Resolve conflict: $ echo A>a @@ -688,7 +688,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue') - [255] + [1] $ echo A>a $ hg resolve --mark