Submitter | Durham Goode |
---|---|
Date | March 8, 2017, 3:22 a.m. |
Message ID | <68644896cbdcfc956079.1488943356@dev111.prn1.facebook.com> |
Download | mbox | patch |
Permalink | /patch/18979/ |
State | Accepted |
Delegated to: | Martin von Zweigbergk |
Headers | show |
Comments
Patch
diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -23,6 +23,7 @@ from .node import ( nullrev, short, wdirid, + wdirnodes, ) from . import ( encoding, @@ -140,7 +141,7 @@ class basectx(object): 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