Show More
@@ -530,14 +530,12 b' def _filternarrowactions(narrowmatch, br' | |||
|
530 | 530 | elif action[0] in mergestatemod.NO_OP_ACTIONS: |
|
531 | 531 | mresult.removefile(f) # merge does not affect file |
|
532 | 532 | elif action[0] in nonconflicttypes: |
|
533 |
|
|
|
534 | _( | |
|
535 | b'merge affects file \'%s\' outside narrow, ' | |
|
536 | b'which is not yet supported' | |
|
537 | ) | |
|
538 | % f, | |
|
539 | hint=_(b'merging in the other direction may work'), | |
|
533 | msg = _( | |
|
534 | b'merge affects file \'%s\' outside narrow, ' | |
|
535 | b'which is not yet supported' | |
|
540 | 536 | ) |
|
537 | hint = _(b'merging in the other direction may work') | |
|
538 | raise error.Abort(msg % f, hint=hint) | |
|
541 | 539 | else: |
|
542 | 540 | raise error.StateError( |
|
543 | 541 | _(b'conflict in file \'%s\' is outside narrow clone') % f |
General Comments 0
You need to be logged in to leave comments.
Login now