diff -r 5db3c748ce8f -r 2f8c476c49fe mercurial/context.py
--- a/mercurial/context.py	Thu Dec 07 13:20:47 2017 -0800
+++ b/mercurial/context.py	Thu Dec 07 13:20:47 2017 -0800
@@ -1990,11 +1990,14 @@
     is `False`, the file was deleted.
     """
 
-    def __init__(self, repo, wrappedctx):
+    def __init__(self, repo):
         super(overlayworkingctx, self).__init__(repo)
         self._repo = repo
         self.clean()
+
+    def setbase(self, wrappedctx):
         self._wrappedctx = wrappedctx
+        self._parents = [wrappedctx]
 
     def data(self, path):
         if self.isdirty(path):