diff -r dbca8f134f00 -r 2754c8273132 mercurial/context.py
--- a/mercurial/context.py	Mon Sep 20 17:01:12 2010 -0500
+++ b/mercurial/context.py	Tue Sep 21 23:37:47 2010 +0200
@@ -844,7 +844,7 @@
                 if self._repo.dirstate[f] != 'r':
                     self._repo.ui.warn(_("%s not removed!\n") % f)
                 else:
-                    fctx = f in pctxs[0] and pctxs[0] or pctxs[1]
+                    fctx = f in pctxs[0] and pctxs[0][f] or pctxs[1][f]
                     t = fctx.data()
                     self._repo.wwrite(f, t, fctx.flags())
                     self._repo.dirstate.normal(f)