Mercurial > hg
view tests/test-absorb-strip.t @ 40147:58ebf5083843
push: add "remote" to 'repository changed while pushing' messages (issue5971)
Differential Revision: https://phab.mercurial-scm.org/D4933
author | Taapas Agrawal <taapas2897@gmail.com> |
---|---|
date | Thu, 11 Oct 2018 03:38:23 +0530 |
parents | 0b7594ada0db |
children | 31dfa7dac4c9 |
line wrap: on
line source
Do not strip innocent children. See https://bitbucket.org/facebook/hg-experimental/issues/6/hg-absorb-merges-diverged-commits $ cat >> $HGRCPATH << EOF > [extensions] > absorb= > drawdag=$TESTDIR/drawdag.py > EOF $ hg init $ hg debugdrawdag << EOF > E > | > D F > |/ > C > | > B > | > A > EOF $ hg up E -q $ echo 1 >> B $ echo 2 >> D $ hg absorb saved backup bundle to * (glob) 2 of 2 chunk(s) applied $ hg log -G -T '{desc}' @ E | o D | o C | o B | | o F | | | o C | | | o B |/ o A