mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
96a9afa2a5
Summary: Since we have `debugbuilddag` as a builtin command, and `drawdag` is pretty useful for writing clean test cases. Let's inline it. This would simplify many tests since `drawdag=..." is no longer needed. Reviewed By: DurhamG Differential Revision: D6827925 fbshipit-source-id: b749f57fd5c55b2cb000dd2da2c2f9bc2386a519
45 lines
544 B
Perl
45 lines
544 B
Perl
Do not strip innocent children. See https://bitbucket.org/facebook/hg-experimental/issues/6/hg-absorb-merges-diverged-commits
|
|
|
|
$ cat >> $HGRCPATH << EOF
|
|
> [extensions]
|
|
> absorb=
|
|
> 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
|
|
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
|
|
|