Mercurial > hg
view tests/test-fastannotate-diffopts.t @ 44160:abcc82bf0717
clean: check that there are no conflicts after
As noted by Pulkit, there should never be any conflicts after doing a
clean update, so `hg.clean()` should never return `True`. Let's check
that assertion instead to clarify the code. The callers will now get a
`None` instead of a `False` returned, but that should be fine (both
result in a 0 exit status).
Differential Revision: https://phab.mercurial-scm.org/D7984
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 24 Jan 2020 09:33:02 -0800 |
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