Mercurial > hg-stable
view tests/test-absorb-strip.t @ 47577:2ee81806831f
run-tests: setup "correct" python earlier
I don't see any good reason to wait. This result in slightly simpler code.
Differential Revision: https://phab.mercurial-scm.org/D11047
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 09 Jul 2021 17:02:01 +0200 |
parents | c91321e86071 |
children |
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 -a warning: orphaned descendants detected, not stripping 112478962961, 26805aba1e60 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