Closed by commit rHG0e5f6c70aeb4: merge: use manifestdict.walk() instead of manifestdict.matches() (authored by durin42). This revision was automatically updated to reflect the committed changes.
CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D8084?vs=20004&id=20006#toc REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8084?vs=20004&id=20006 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8084/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8084 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -997,11 +997,10 @@ """ Check for case-folding collisions. """ - # If the repo is narrowed, filter out files outside the narrowspec. narrowmatch = repo.narrowmatch() if not narrowmatch.always(): - wmf = wmf.matches(narrowmatch) + pmmf = set(wmf.walk(narrowmatch)) if actions: narrowactions = {} for m, actionsfortype in pycompat.iteritems(actions): @@ -1010,9 +1009,9 @@ if narrowmatch(f): narrowactions[m].append((f, args, msg)) actions = narrowactions - - # build provisional merged manifest up - pmmf = set(wmf) + else: + # build provisional merged manifest up + pmmf = set(wmf) if actions: # KEEP and EXEC are no-op To: durin42, #hg-reviewers, martinvonz Cc: martinvonz, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
