Mercurial > hg
view .arcconfig @ 43934:71fee4564410
rebase: use rewriteutil.precheck() instead of reimplementing it
After this patch, there's still another place in `rebase.py`, in the
`--stop` code path, that reimplements `rewriteutil.precheck()`. I
couldn't fix that place because it `rewriteutil.precheck()` checks
that there is only one dirstate parent, which fails because we have
two parents at that point. I think it's incorrect that rebase leaves
the user with two parents during conflicts, but changing that is way
out of scope for this series.
Differential Revision: https://phab.mercurial-scm.org/D7685
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 18 Dec 2019 09:18:02 +0300 |
parents | b2c27d84f05c |
children | ff396501e841 |
line wrap: on
line source
{ "conduit_uri": "https://phab.mercurial-scm.org/api", "repository.callsign": "HG", "arc.land.onto.default": "@", "base": "hg:.^" }