Mercurial > hg
view tests/test-absorb-strip.t @ 47063:1d075b857c90 stable
tests: ensure `$PYTHON` is quoted for Windows
Global installs of python3 go into "Program Files", and tons of tests fail with
mysterious errors if this isn't quoted. Most of this is a followup to
0826d684a1b5, but a some of these were existing issues. Shebang lines are
ignored because quoting breaks direct execution- these will need to be launched
indirectly with the quoted `$PYTHON` command.
Differential Revision: https://phab.mercurial-scm.org/D10633
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 01 May 2021 00:41:43 -0400 |
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