D6655: continue: added support for graft

[martinvonz (Martin von Zweigbergk)]

martinvonz added inline comments.

INLINE COMMENTS

> cmdutil.py:3482-3498
> +            if not cont:
> +                # perform the graft merge with p1(rev) as 'ancestor'
> +                overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
> +                base = ctx.p1()
> +                with ui.configoverride(overrides, 'graft'):
> +                    stats = mergemod.graft(repo, ctx, base, ['local', 'graft'])
> +                # report any conflicts

It looks like pretty much this entire function is copies `commands.graft()` and then all this code is left dead here (since `cont = True` above). I'd prefer to de-queue this commit and let you clean this up and then submit a new patch, but maybe other reviewers are less picky or stubborn than I am, so I'll leave it queued until I hear from someone else.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6655/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6655

To: taapas1128, #hg-reviewers
Cc: mharbison72, martinvonz, durin42, mercurial-devel