author | Matt Harbison <matt_harbison@yahoo.com> |
Mon, 01 Oct 2018 21:48:45 -0400 | |
changeset 39947 | a063b84ce064 |
parent 39667 | 0b7594ada0db |
child 40190 | 31dfa7dac4c9 |
permissions | -rw-r--r-- |
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