1.1 --- a/hgext/mq.py
     1.2 +++ b/hgext/mq.py
     1.3 @@ -2011,10 +2011,14 @@
     1.4      if r:
     1.5          wlock = r.wlock()
     1.6          try:
     1.7 -            if r.dirstate[name] == 'r':
     1.8 -                r.undelete([name])
     1.9 -            r.copy(patch, name)
    1.10 -            r.remove([patch], False)
    1.11 +            if r.dirstate[patch] == 'a':
    1.12 +                r.dirstate.forget(patch)
    1.13 +                r.dirstate.add(name)
    1.14 +            else:
    1.15 +                if r.dirstate[name] == 'r':
    1.16 +                    r.undelete([name])
    1.17 +                r.copy(patch, name)
    1.18 +                r.remove([patch], False)
    1.19          finally:
    1.20              del wlock
    1.21