##// END OF EJS Templates
merge: break up a not-so-one-liner for readability...
marmoute -
r49550:85c69b0d default
parent child Browse files
Show More
@@ -530,14 +530,12 b' def _filternarrowactions(narrowmatch, br'
530 elif action[0] in mergestatemod.NO_OP_ACTIONS:
530 elif action[0] in mergestatemod.NO_OP_ACTIONS:
531 mresult.removefile(f) # merge does not affect file
531 mresult.removefile(f) # merge does not affect file
532 elif action[0] in nonconflicttypes:
532 elif action[0] in nonconflicttypes:
533 raise error.Abort(
533 msg = _(
534 _(
534 b'merge affects file \'%s\' outside narrow, '
535 b'merge affects file \'%s\' outside narrow, '
535 b'which is not yet supported'
536 b'which is not yet supported'
537 )
538 % f,
539 hint=_(b'merging in the other direction may work'),
540 )
536 )
537 hint = _(b'merging in the other direction may work')
538 raise error.Abort(msg % f, hint=hint)
541 else:
539 else:
542 raise error.StateError(
540 raise error.StateError(
543 _(b'conflict in file \'%s\' is outside narrow clone') % f
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