Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/rebase.py
branchstable
changeset 13894 14c0988c314d
parent 13235 6bf39d88c857
child 13895 e4ffb9576b63
child 14497 ea585f2b1adc 
--- a/hgext/rebase.py	Sun Apr 03 23:47:17 2011 +0900
+++ b/hgext/rebase.py	Sun Mar 27 13:34:20 2011 +0200
@@ -270,7 +270,7 @@
         if k in m1:
             if v in m1 or v in m2:
                 repo.dirstate.copy(v, k)
-                if v in m2 and v not in m1:
+                if v in m2 and v not in m1 and k in m2:
                     repo.dirstate.remove(v)
 
 def concludenode(repo, rev, p1, p2, commitmsg=None, extrafn=None):
mercurial