Mercurial > hg
view tests/test-absorb-strip.t @ 49352:0cc5f74ff7f0 stable 6.1.4
purge: prevent a silly crash with --confirm --files
if --files is passed, there was no directory to checks and `msg` was undefined.
This is now fixed and tested.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 14 Jun 2022 11:26:18 +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