branch | stable |
changeset 16551 | ebf6d38c9063 |
parent 16542 | e596a631210e |
child 16553 | 9224cc2e99cc |
--- a/mercurial/cmdutil.py Sun Apr 29 16:18:46 2012 +0200 +++ b/mercurial/cmdutil.py Sun Apr 29 22:25:55 2012 +0200 @@ -1384,7 +1384,7 @@ newid = repo.commitctx(new) if newid != old.node(): # Reroute the working copy parent to the new changeset - repo.dirstate.setparents(newid, nullid) + repo.setparents(newid, nullid) # Move bookmarks from old parent to amend commit bms = repo.nodebookmarks(old.node())