2017-05-17 02:25:00 +03:00
|
|
|
Do not strip innocent children. See https://bitbucket.org/facebook/hg-experimental/issues/6/hg-absorb-merges-diverged-commits
|
|
|
|
|
|
|
|
$ cat >> $HGRCPATH << EOF
|
|
|
|
> [extensions]
|
2018-01-09 00:57:01 +03:00
|
|
|
> absorb=
|
2017-05-17 02:25:00 +03:00
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ hg init
|
|
|
|
$ hg debugdrawdag << EOF
|
|
|
|
> E
|
|
|
|
> |
|
|
|
|
> D F
|
|
|
|
> |/
|
|
|
|
> C
|
|
|
|
> |
|
|
|
|
> B
|
|
|
|
> |
|
|
|
|
> A
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ hg up E -q
|
|
|
|
$ echo 1 >> B
|
|
|
|
$ echo 2 >> D
|
2018-10-13 11:00:22 +03:00
|
|
|
$ 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
|
2018-11-06 14:14:11 +03:00
|
|
|
2 of 2 chunks applied
|
2017-05-17 02:25:00 +03:00
|
|
|
|
|
|
|
$ hg log -G -T '{desc}'
|
|
|
|
@ E
|
|
|
|
|
|
|
|
|
o D
|
|
|
|
|
|
|
|
|
o C
|
|
|
|
|
|
|
|
|
o B
|
|
|
|
|
|
2018-10-27 04:52:14 +03:00
|
|
|
| x E
|
2017-05-17 02:25:00 +03:00
|
|
|
| |
|
2018-10-27 04:52:14 +03:00
|
|
|
| | o F
|
|
|
|
| | |
|
|
|
|
| x | D
|
|
|
|
| |/
|
|
|
|
| x C
|
2017-05-17 02:25:00 +03:00
|
|
|
| |
|
2018-10-27 04:52:14 +03:00
|
|
|
| x B
|
2017-05-17 02:25:00 +03:00
|
|
|
|/
|
|
|
|
o A
|
|
|
|
|