diff -r 8eec040cb65e -r 0bb98eee531d mercurial/context.py
--- a/mercurial/context.py	Sat Apr 18 14:03:41 2015 +0900
+++ b/mercurial/context.py	Sat Apr 18 14:10:55 2015 +0900
@@ -1618,7 +1618,7 @@
         for pc in pcl[1:]:
             pl.append((path, filenode(pc, path), fl))
 
-        return [filectx(self._repo, p, fileid=n, filelog=l)
+        return [self._parentfilectx(p, fileid=n, filelog=l)
                 for p, n, l in pl if n != nullid]
 
     def children(self):