Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 34054:65ae54582713

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: move some of the logic in batchget() to workingfilectx We will use this logic in two places with in-memory merge. Differential Revision: https://phab.mercurial-scm.org/D444
author Phil Cohen <phillco@fb.com>
date Thu, 31 Aug 2017 11:28:59 -0700
parents 055fee3547df
children c0ce60459d84
line wrap: on
line diff
--- a/mercurial/merge.py	Thu Aug 31 11:28:59 2017 -0700
+++ b/mercurial/merge.py	Thu Aug 31 11:28:59 2017 -0700
@@ -1150,9 +1150,7 @@
                 except OSError as e:
                     if e.errno != errno.ENOENT:
                         raise
-
-            if repo.wvfs.isdir(f) and not repo.wvfs.islink(f):
-                repo.wvfs.removedirs(f)
+            wctx[f].clearunknown()
             wctx[f].write(fctx(f).data(), flags, backgroundclose=True)
             if i == 100:
                 yield i, f