Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/merge.py @ 48716:ec23b0ba85c2
merge: break up a not-so-one-liner for readability
Differential Revision: https://phab.mercurial-scm.org/D12105
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 28 Jan 2022 14:24:41 +0100 |
| parents | 85c69b0dfa8f |
| children | 6c4b10d01af0 |
comparison
equal
deleted
inserted
replaced
| 48715:85c69b0dfa8f | 48716:ec23b0ba85c2 |
|---|---|
| 535 b'which is not yet supported' | 535 b'which is not yet supported' |
| 536 ) | 536 ) |
| 537 hint = _(b'merging in the other direction may work') | 537 hint = _(b'merging in the other direction may work') |
| 538 raise error.Abort(msg % f, hint=hint) | 538 raise error.Abort(msg % f, hint=hint) |
| 539 else: | 539 else: |
| 540 raise error.StateError( | 540 msg = _(b'conflict in file \'%s\' is outside narrow clone') |
| 541 _(b'conflict in file \'%s\' is outside narrow clone') % f | 541 raise error.StateError(msg % f) |
| 542 ) | |
| 543 | 542 |
| 544 | 543 |
| 545 class mergeresult(object): | 544 class mergeresult(object): |
| 546 """An object representing result of merging manifests. | 545 """An object representing result of merging manifests. |
| 547 | 546 |