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

Jun Wu quark at fb.com
Mon Jun 26 14:46:43 EDT 2017


Excerpts from Martin von Zweigbergk's message of 2017-06-26 11:08:51 -0700:
> That makes sense.
> 
> My question about divergence still stands, I think.

To be clear, "divergence" is when rebase would create divergence changesets.

I think we can implement and have some [commands] config so users could
choose their desired behavior listed in CEDRebase wiki [1].

I agree if split (with rebase enabled) is nicer to abort early if the rebase
will abort. But the implementation is cleaner if split is not coupled with
rebase internal. Since the divergent case is pretty advanced and we do have
backups for split selection, I'd prefer cleaner implementation.

[1]: https://www.mercurial-scm.org/wiki/CEDRebase


More information about the Mercurial-devel mailing list