mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
9bf6b674a6
Summary: Change the legacy Python graph render to Rust renderer. Reviewed By: DurhamG Differential Revision: D24317802 fbshipit-source-id: 4c3dc3a6dd02b7ebe79596a8e77f4b6b139d2e20
56 lines
732 B
Perl
56 lines
732 B
Perl
#chg-compatible
|
|
|
|
Do not strip innocent children. See https://bitbucket.org/facebook/hg-experimental/issues/6/hg-absorb-merges-diverged-commits
|
|
|
|
$ enable absorb
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
$ hg debugdrawdag << EOF
|
|
> E
|
|
> |
|
|
> D F
|
|
> |/
|
|
> C
|
|
> |
|
|
> B
|
|
> |
|
|
> A
|
|
> EOF
|
|
|
|
$ hg up E -q
|
|
$ echo 1 >> B
|
|
$ echo 2 >> D
|
|
$ hg absorb -a
|
|
showing changes for B
|
|
@@ -0,1 +0,1 @@
|
|
1124789 -B
|
|
1124789 +B1
|
|
showing changes for D
|
|
@@ -0,1 +0,1 @@
|
|
f585351 -D
|
|
f585351 +D2
|
|
|
|
2 changesets affected
|
|
f585351 D
|
|
1124789 B
|
|
2 of 2 chunks applied
|
|
|
|
$ hg log -G -T '{desc}'
|
|
@ E
|
|
│
|
|
o D
|
|
│
|
|
o C
|
|
│
|
|
o B
|
|
│
|
|
│ o F
|
|
│ │
|
|
│ x C
|
|
│ │
|
|
│ x B
|
|
├─╯
|
|
o A
|
|
|