Mercurial > hg
view tests/test-absorb-phase.t @ 44438:f0021fbedea9
cleanup: remove redundant clearing of mergestate in rebase and shelve
`repo.commit()` now clears the merge state even if it ends up not
creating a commit because there were no changes to commit.
Differential Revision: https://phab.mercurial-scm.org/D8197
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 28 Feb 2020 11:32:27 -0800 |
parents | 31dfa7dac4c9 |
children |
line wrap: on
line source
$ cat >> $HGRCPATH << EOF > [extensions] > absorb= > drawdag=$TESTDIR/drawdag.py > EOF $ hg init $ hg debugdrawdag <<'EOS' > C > | > B > | > A > EOS $ hg phase -r A --public -q $ hg phase -r C --secret --force -q $ hg update C -q $ printf B1 > B $ hg absorb -aq $ hg log -G -T '{desc} {phase}' @ C secret | o B draft | o A public