equal
deleted
inserted
replaced
528 elif not branchmerge: |
528 elif not branchmerge: |
529 mresult.removefile(f) # just updating, ignore changes outside clone |
529 mresult.removefile(f) # just updating, ignore changes outside clone |
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 |
544 ) |
542 ) |
545 |
543 |