[RFC] New core command: graft

[Pierre-Yves David]

On 10 oct. 2011, at 00:23, Matt Mackall wrote:

> The implementation I have so far works, but there's still some work to
> do:
> 
> - needs to actually support --continue
> - needs testing
> 
> Among other things, I'm looking for feedback on the UI and what features
> are critical. Right now, it copies the details of grafted changesets
> (user/date/description) verbatim. That's an ok default, but it seems
> like we'd like to be able to tweak that.


I'm not a fan of the --continue switch. We could use the same approach than in merge, recording that we are doing something special and refuse to do most operation but a commit. A conflict during graft would ask you to resolve and commit. Using commit would allow to use the existing UI to tweak the default value if needed. After the commit, the graft will continue until it complete. Interactive (-i, --interactive) graft would ask for an explicit commit for each grafted changeset.

A more stupid question is : "how is graft different from a rebase --keep where you can specify where to stop your rebasing ?"

-- 
Pierre-Yves David