Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/context.py
changeset 31258 c414e339e7af
parent 31076 0e07855e6054
child 31259 6a9d0d24fdb4 
--- a/mercurial/context.py	Tue Mar 07 18:38:20 2017 -0800
+++ b/mercurial/context.py	Tue Mar 07 09:56:11 2017 -0800
@@ -23,6 +23,7 @@
     nullrev,
     short,
     wdirid,
+    wdirnodes,
 )
 from . import (
     encoding,
@@ -140,7 +141,7 @@
                 removed.append(fn)
             elif flag1 != flag2:
                 modified.append(fn)
-            elif node2 != newnodeid:
+            elif node2 not in wdirnodes:
                 # When comparing files between two commits, we save time by
                 # not comparing the file contents when the nodeids differ.
                 # Note that this means we incorrectly report a reverted change
Mercurial