Mercurial > hg
comparison tests/test-bisect.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 | 34a46d48d24e |
| children | 8d72e29ad1e0 |
comparison
equal
deleted
inserted
replaced
| 44724:5c2a4f37eace | 44725:16c361152133 |
|---|---|
| 562 | 562 |
| 563 $ hg graft -q 15 | 563 $ hg graft -q 15 |
| 564 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 564 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 565 abort: unresolved conflicts, can't continue | 565 abort: unresolved conflicts, can't continue |
| 566 (use 'hg resolve' and 'hg graft --continue') | 566 (use 'hg resolve' and 'hg graft --continue') |
| 567 [255] | 567 [1] |
| 568 $ hg bisect --reset | 568 $ hg bisect --reset |
| 569 $ hg up -C . | 569 $ hg up -C . |
| 570 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 570 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 571 | 571 |
| 572 Check that bisect does not break on obsolete changesets | 572 Check that bisect does not break on obsolete changesets |