D784: merge: check for path conflicts when merging

[mbthomas (Mark Thomas)]

mbthomas added inline comments.

INLINE COMMENTS

> merge.py:903-921
> +        # Check if all files in the conflicting directories have been removed.
> +        for f in mf:
> +            if f not in deletedfiles:
> +                for p in util.finddirs(f):
> +                    if p in remoteconflicts:
> +                        m, args, msg = actions[p]
> +                        pnew = util.safename(p, str(mctx), wctx,

This is potentially slow for large repos, as it has to iterate over the whole manifest.

What I actually want to do is find the files in the directories named by `remoteconflicts`, which should be a small set, however I can't see a way to do that with the manifest API.  Suggestions for improvement welcome.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D784

To: mbthomas, #hg-reviewers
Cc: mercurial-devel