changeset 29056 | e2178f7d17c0 |
parent 28240 | 1ac8ce137377 |
child 29389 | 98e8313dcd9e |
--- a/mercurial/manifest.py Tue Apr 19 11:00:15 2016 +0100 +++ b/mercurial/manifest.py Mon May 02 15:22:16 2016 -0700 @@ -211,8 +211,10 @@ def filesnotin(self, m2): '''Set of files in this manifest that are not in the other''' - files = set(self) - files.difference_update(m2) + diff = self.diff(m2) + files = set(filepath + for filepath, hashflags in diff.iteritems() + if hashflags[1][0] is None) return files @propertycache