author | Augie Fackler <augie@google.com> |
Tue, 04 Dec 2018 17:13:01 -0500 | |
changeset 40819 | cb372d09d30a |
parent 40190 | 31dfa7dac4c9 |
child 41812 | c91321e86071 |
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 -a 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