Mercurial > public > mercurial-scm > hg-stable
diff hgext/rebase.py @ 13894:14c0988c314d stable
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
| author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
|---|---|
| date | Sun, 27 Mar 2011 13:34:20 +0200 |
| parents | 6bf39d88c857 |
| children | e4ffb9576b63 ea585f2b1adc |
line wrap: on
line diff
--- 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):