Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 48366:8e855e9984a6
errors: use detailed exit code when trying to merge file outside narrowspec
Differential Revision: https://phab.mercurial-scm.org/D11827
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 19 Nov 2021 15:39:35 -0800 |
| parents | 96aa3a68d3b5 |
| children | c655483ea6e2 |
comparison
equal
deleted
inserted
replaced
| 48365:67064c238ae7 | 48366:8e855e9984a6 |
|---|---|
| 540 ) | 540 ) |
| 541 % f, | 541 % f, |
| 542 hint=_(b'merging in the other direction may work'), | 542 hint=_(b'merging in the other direction may work'), |
| 543 ) | 543 ) |
| 544 else: | 544 else: |
| 545 raise error.Abort( | 545 raise error.StateError( |
| 546 _(b'conflict in file \'%s\' is outside narrow clone') % f | 546 _(b'conflict in file \'%s\' is outside narrow clone') % f |
| 547 ) | 547 ) |
| 548 | 548 |
| 549 | 549 |
| 550 class mergeresult(object): | 550 class mergeresult(object): |