Mercurial > hg
changeset 22904:baa3cfa03a83
histedit: use merge.graft
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 13 Oct 2014 17:12:47 -0500 |
| parents | 3d51e756b1ec |
| children | 63e889cc610d |
| files | hgext/histedit.py |
| diffstat | 1 files changed, 1 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/histedit.py Mon Oct 13 17:12:31 2014 -0500 +++ b/hgext/histedit.py Mon Oct 13 17:12:47 2014 -0500 @@ -221,20 +221,13 @@ cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True) stats = None else: - repo.dirstate.beginparentchange() try: # ui.forcemerge is an internal variable, do not document repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'histedit') - stats = mergemod.update(repo, ctx.node(), True, True, False, - ctx.p1().node()) + stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'histedit']) finally: repo.ui.setconfig('ui', 'forcemerge', '', 'histedit') - repo.setparents(wcpar, node.nullid) - repo.dirstate.endparentchange() - repo.dirstate.write() - # fix up dirstate for copies and renames - copies.duplicatecopies(repo, ctx.rev(), ctx.p1().rev()) return stats def collapse(repo, first, last, commitopts):