| changeset 6471: |
2519976a998b |
| parent 6470: | d90d83ebea9e |
|---|
| child 6472: | 05a682c8907d |
|---|
| author: |
Weijun Wang <weijun.wang@sun.com> |
| date: |
Fri Jun 06 18:23:31 2008 +0200 (13 months ago) |
| files: |
hgext/mq.py |
| description: |
mq: handle added patch renaming correctly |
1--- a/hgext/mq.py Tue Jun 03 12:10:14 2008 +0200
2+++ b/hgext/mq.py Fri Jun 06 18:23:31 2008 +0200
3@@ -2011,10 +2011,14 @@
4 if r:
5 wlock = r.wlock()
6 try:
7- if r.dirstate[name] == 'r':
8- r.undelete([name])
9- r.copy(patch, name)
10- r.remove([patch], False)
11+ if r.dirstate[patch] == 'a':
12+ r.dirstate.forget(patch)
13+ r.dirstate.add(name)
14+ else:
15+ if r.dirstate[name] == 'r':
16+ r.undelete([name])
17+ r.copy(patch, name)
18+ r.remove([patch], False)
19 finally:
20 del wlock
21
