##// END OF EJS Templates
graft: do not try to skip rev derived from ancestor more than once (issue6024)...
graft: do not try to skip rev derived from ancestor more than once (issue6024) We check 'x in revs' in other cases, so let's do the same. The test case credits to Tom Prince.

File last commit:

r40226:31dfa7da default
r40692:3bc2e550 stable
Show More
test-absorb-strip.t
45 lines | 579 B | text/troff | Tads3Lexer
/ tests / test-absorb-strip.t
Augie Fackler
absorb: import extension from Facebook's hg-experimental...
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
tests: fix a couple of drawdag.py references...
r39703 > drawdag=$TESTDIR/drawdag.py
Augie Fackler
absorb: import extension from Facebook's hg-experimental...
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
absorb: prompt user to accept absorb changes by default...
r40226 $ hg absorb -a
Augie Fackler
absorb: import extension from Facebook's hg-experimental...
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