Mercurial > hg
view tests/test-absorb-phase.t @ 48584:74973a6d4e67
filemerge: always define a "base" label
It simplifies the code and improves the conflict markers to always
have the "base" label defined.
Differential Revision: https://phab.mercurial-scm.org/D12016
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 20 Jan 2022 14:13:12 -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