Mercurial > public > mercurial-scm > hg-stable
diff hgext/rebase.py @ 16551:ebf6d38c9063 stable
localrepo: add setparents() to adjust dirstate copies (issue3407)
The fix introduced in eab9119c5dee was only partially successful. It is correct
to turn dirstate 'm' merge records into normal/dirty ones but copy records are
lost in the process. To adjust them as well, we need to look in the first
parent manifest to know which files were added and preserve only related
records. But the dirstate does not have access to changesets, the logic has to
moved at another level, in localrepo.
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Sun, 29 Apr 2012 22:25:55 +0200 |
| parents | b9f51f49bf2a |
| children | 9b7d2ff4b006 f8af57c00a29 |
line wrap: on
line diff
--- a/hgext/rebase.py Sun Apr 29 16:18:46 2012 +0200 +++ b/hgext/rebase.py Sun Apr 29 22:25:55 2012 +0200 @@ -277,7 +277,7 @@ editor=editor) else: # Skip commit if we are collapsing - repo.dirstate.setparents(repo[p1].node()) + repo.setparents(repo[p1].node()) newrev = None # Update the state if newrev is not None: @@ -361,7 +361,7 @@ def concludenode(repo, rev, p1, p2, commitmsg=None, editor=None, extrafn=None): 'Commit the changes and store useful information in extra' try: - repo.dirstate.setparents(repo[p1].node(), repo[p2].node()) + repo.setparents(repo[p1].node(), repo[p2].node()) ctx = repo[rev] if commitmsg is None: commitmsg = ctx.description()