--- a/mercurial/cmdutil.py Wed Feb 24 10:41:15 2016 -0800
+++ b/mercurial/cmdutil.py Wed Feb 24 15:55:44 2016 -0600
@@ -2850,10 +2850,6 @@
mf = ctx.manifest()
if node == p2:
parent = p2
- if node == parent:
- pmf = mf
- else:
- pmf = None
# need all matching names in dirstate and manifest of target rev,
# so have to walk both. do not print errors if files exist in one
@@ -2968,11 +2964,7 @@
# in case of merge, files that are actually added can be reported as
# modified, we need to post process the result
if p2 != nullid:
- if pmf is None:
- # only need parent manifest in the merge case,
- # so do not read by default
- pmf = repo[parent].manifest()
- mergeadd = dsmodified - set(pmf)
+ mergeadd = dsmodified - smf
dsadded |= mergeadd
dsmodified -= mergeadd