##// END OF EJS Templates
py3: fix test-dirstate-race.t...
py3: fix test-dirstate-race.t Differential Revision: https://phab.mercurial-scm.org/D5106

File last commit:

r40226:31dfa7da default
r40332:e787d97e default
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