Mercurial > hg
diff tests/test-rebase-collapse.t @ 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 | c339a01acd9a |
children | e733c59f3c09 |
line wrap: on
line diff
--- a/tests/test-rebase-collapse.t Tue Dec 17 10:53:51 2019 -0800 +++ b/tests/test-rebase-collapse.t Wed Dec 18 09:18:02 2019 +0300 @@ -592,7 +592,7 @@ o 0: f447d5abf5ea 'add' $ hg rebase --collapse -r 1 -d 0 - abort: can't remove original changesets with unrebased descendants + abort: cannot rebase changeset with children (use --keep to keep original changesets) [255]