diff hgext/mq.py @ 6650:2c9565971abc

Merge with crew-stable

--- a/hgext/mq.py	Thu Jun 05 16:25:11 2008 +0200
+++ b/hgext/mq.py	Fri Jun 06 18:31:57 2008 +0200
@@ -2038,10 +2038,14 @@
     if r:
         wlock = r.wlock()
         try:
-            if r.dirstate[name] == 'r':
-                r.undelete([name])
-            r.copy(patch, name)
-            r.remove([patch], False)
+            if r.dirstate[patch] == 'a':
+                r.dirstate.forget(patch)
+                r.dirstate.add(name)
+            else:
+                if r.dirstate[name] == 'r':
+                    r.undelete([name])
+                r.copy(patch, name)
+                r.remove([patch], False)
         finally:
             del wlock