Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 13777:f6e5035dc81a | 13778:46c3043253fb |
|---|---|
| 275 m2 = repo[p1].manifest() | 275 m2 = repo[p1].manifest() |
| 276 for k, v in cop.iteritems(): | 276 for k, v in cop.iteritems(): |
| 277 if k in m1: | 277 if k in m1: |
| 278 if v in m1 or v in m2: | 278 if v in m1 or v in m2: |
| 279 repo.dirstate.copy(v, k) | 279 repo.dirstate.copy(v, k) |
| 280 if v in m2 and v not in m1: | 280 if v in m2 and v not in m1 and k in m2: |
| 281 repo.dirstate.remove(v) | 281 repo.dirstate.remove(v) |
| 282 | 282 |
| 283 def concludenode(repo, rev, p1, p2, commitmsg=None, extrafn=None): | 283 def concludenode(repo, rev, p1, p2, commitmsg=None, extrafn=None): |
| 284 'Commit the changes and store useful information in extra' | 284 'Commit the changes and store useful information in extra' |
| 285 try: | 285 try: |