# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1285105067 -7200
# Node ID 2754c82731326453a3cf20f43eb68eeae5e22123
# Parent  dbca8f134f00fb10f7154b2f6cd9b8188095b1de# Parent  4ae3e5dffa60ae2843871534cda9c79ed1f340eb
Merge with stable

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)
diff -r dbca8f134f00 -r 2754c8273132 tests/test-hgweb.out
diff -r dbca8f134f00 -r 2754c8273132 tests/test-mq-qrename.t
--- a/tests/test-mq-qrename.t	Mon Sep 20 17:01:12 2010 -0500
+++ b/tests/test-mq-qrename.t	Tue Sep 21 23:37:47 2010 +0200
@@ -59,4 +59,25 @@
 
   $ cd ..
 
+Test overlapping renames (issue2388)
 
+  $ hg init c
+  $ cd c
+  $ hg qinit -c
+  $ echo a > a
+  $ hg add
+  adding a
+  $ hg qnew patcha
+  $ echo b > b
+  $ hg add
+  adding b
+  $ hg qnew patchb
+  $ hg ci --mq -m c1
+  $ hg qrename patchb patchc
+  $ hg qrename patcha patchb
+  $ hg st --mq
+  M patchb
+  M series
+  A patchc
+  R patcha
+  $ cd ..