Mercurial > hg
view tests/test-absorb-strip.t @ 45108:a659d5a4d2d5
run-tests: replace '#' with '-' in temp path of repos created for tests
If we have multiple cases in a test, that leads us to a temp path of
format "<temp-path>-<case1>#<case2>".
This leads to hg.parseurl() parsing the path and take part
after `#` as a branch name.
I encountered this bug while adding support for share-safe case in next patch.
Differential Revision: https://phab.mercurial-scm.org/D8647
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 22 Jun 2020 13:51:48 +0530 |
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