diff -r 7cfe58983bff -r 11a160547d7f mercurial/context.py
--- a/mercurial/context.py	Wed Dec 17 17:26:12 2014 -0800
+++ b/mercurial/context.py	Thu Dec 18 09:37:14 2014 -0800
@@ -1165,6 +1165,8 @@
         return sorted(self._repo.dirstate.matches(match))
 
     def ancestors(self):
+        for p in self._parents:
+            yield p
         for a in self._repo.changelog.ancestors(
             [p.rev() for p in self._parents]):
             yield changectx(self._repo, a)