Patchwork D1214: merge: don't check for unknown files in IMM

login
register
mail settings
Submitter phabricator
Date Nov. 16, 2017, 6:01 a.m.
Message ID <fd1c1dc8d6427974e6a7e16bbfec80ca@localhost.localdomain>
Download mbox | patch
Permalink /patch/25597/
State Not Applicable
Headers show

Comments

phabricator - Nov. 16, 2017, 6:01 a.m.
phillco updated this revision to Diff 3554.

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1214?vs=3063&id=3554

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

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




To: phillco, #hg-reviewers
Cc: mercurial-devel, martinvonz

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -646,6 +646,14 @@ 
     return config
 
 def _checkunknownfile(repo, wctx, mctx, f, f2=None):
+    if wctx.isinmemory():
+        # Nothing to do in IMM because nothing in the "working copy" can be an
+        # unknown file.
+        #
+        # Note that we should bail out here, not in ``_checkunknownfiles()``,
+        # because that function does other useful work.
+        return False
+
     if f2 is None:
         f2 = f
     return (repo.wvfs.audit.check(f)