test-absorb-strip.t
46 lines
| 662 B
| text/troff
|
Tads3Lexer
/ tests / test-absorb-strip.t
Augie Fackler
|
r38953 | Do not strip innocent children. See https://bitbucket.org/facebook/hg-experimental/issues/6/hg-absorb-merges-diverged-commits | ||
$ cat >> $HGRCPATH << EOF | ||||
> [extensions] | ||||
> absorb= | ||||
Augie Fackler
|
r39703 | > drawdag=$TESTDIR/drawdag.py | ||
Augie Fackler
|
r38953 | > EOF | ||
$ hg init | ||||
$ hg debugdrawdag << EOF | ||||
> E | ||||
> | | ||||
> D F | ||||
> |/ | ||||
> C | ||||
> | | ||||
> B | ||||
> | | ||||
> A | ||||
> EOF | ||||
$ hg up E -q | ||||
$ echo 1 >> B | ||||
$ echo 2 >> D | ||||
Mark Thomas
|
r40226 | $ hg absorb -a | ||
Martin von Zweigbergk
|
r41978 | warning: orphaned descendants detected, not stripping 112478962961, 26805aba1e60 | ||
Augie Fackler
|
r38953 | 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 | ||||