comparison mercurial/merge.py @ 48746:18e69f224e4b

narrow: add support for merging add and remove outside of the tracked set

This extend f1eb77dceb36 to test and support the remaining action. Or, at least,
the simple incarnation of them.

Differential Revision: https://phab.mercurial-scm.org/D12181

48745:94e36b230990

        elif not branchmerge:
            mresult.removefile(f)  # just updating, ignore changes outside clone
        elif action[0].no_op:
            mresult.removefile(f)  # merge does not affect file
        elif action[0].narrow_safe:
            if (
                not f.endswith(b'/')
                and action[0].changes == mergestatemod.CHANGE_MODIFIED
            ):
                mresult.removefile(f)  # merge won't affect on-disk files

                mresult.addcommitinfo(
                    f, b'outside-narrow-merge-action', action[0].changes
                )

48746:18e69f224e4b

        elif not branchmerge:
            mresult.removefile(f)  # just updating, ignore changes outside clone
        elif action[0].no_op:
            mresult.removefile(f)  # merge does not affect file
        elif action[0].narrow_safe:
            if not f.endswith(b'/'):
                mresult.removefile(f)  # merge won't affect on-disk files

                mresult.addcommitinfo(
                    f, b'outside-narrow-merge-action', action[0].changes
                )