Mercurial > hg
view tests/test-fastannotate-diffopts.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 | 1ddb296e0dee |
children |
line wrap: on
line source
$ cat >> $HGRCPATH << EOF > [extensions] > fastannotate= > EOF $ hg init repo $ cd repo changes to whitespaces $ cat >> a << EOF > 1 > > > 2 > EOF $ hg commit -qAm '1' $ cat > a << EOF > 1 > > 2 > > > 3 > EOF $ hg commit -m 2 $ hg fastannotate -wB a 0: 1 0: 1: 2 0: 1: 1: 3