2019-12-10 02:24:31 +03:00
|
|
|
#chg-compatible
|
2022-08-17 00:59:23 +03:00
|
|
|
#debugruntest-compatible
|
2019-12-10 02:24:31 +03:00
|
|
|
|
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
|
|
|
|
|
2020-01-20 13:42:49 +03:00
|
|
|
$ enable absorb
|
2017-05-17 02:25:00 +03:00
|
|
|
|
2020-09-24 19:44:20 +03:00
|
|
|
$ hg init repo
|
|
|
|
$ cd repo
|
2017-05-17 02:25:00 +03:00
|
|
|
$ 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
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2017-05-17 02:25:00 +03:00
|
|
|
o D
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2017-05-17 02:25:00 +03:00
|
|
|
o C
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2017-05-17 02:25:00 +03:00
|
|
|
o B
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
│ o F
|
|
|
|
│ │
|
|
|
|
│ x C
|
|
|
|
│ │
|
|
|
|
│ x B
|
|
|
|
├─╯
|
2017-05-17 02:25:00 +03:00
|
|
|
o A
|
|
|
|
|