Mercurial > public > mercurial-scm > hg
diff hgext/rebase.py @ 13778:46c3043253fb
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 | 627e50e9e316 |
| children | 0995eee8ffe4 |
line wrap: on
line diff
--- a/hgext/rebase.py Sun Mar 27 12:22:07 2011 +0200 +++ b/hgext/rebase.py Sun Mar 27 13:34:20 2011 +0200 @@ -277,7 +277,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):