[PATCH 1 of 2] split: new extension to split changesets

Jun Wu quark at fb.com
Wed Jun 28 00:08:13 EDT 2017


Excerpts from Martin von Zweigbergk's message of 2017-06-27 20:51:48 -0700:
> I agree that it's a problem that rebase can deal better with. However,
> since it doesn't yet do that, I think it becomes split's problem. We
> have the config to allow divergence. If that's not set, I suppose the
> rebase will fail. Split should ideally detect that early so the user
> won't have lost their work deciding how to split the commit up.
> However, I don't think that feature needs to go into the first version
> of split. We just need to get it fixed before the next release.

I have another idea - having a "splitstate" so people can resume a split.
That solves other issue like if people exit the editor with non zero code,
they won't lose previously split commits. It makes the split implementation
more complex, but I think I can deal with that complexity and it looks
cleaner. What do you think?


More information about the Mercurial-devel mailing list