mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
8c4a52d608
Summary: This makes tests closer to production setup and removes a bunch of "saved backup bundle to ..." messages. With D9236657, this should not hurt server-side performance. Unfortunately a lot tests cannot be migrated easily, mostly because revision numbers are used. They are left with a TODO. Reviewed By: DurhamG Differential Revision: D9237694 fbshipit-source-id: c993fce18f07aba09f6d70964e248af8d501575a
60 lines
755 B
Perl
60 lines
755 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 -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 chunk(s) applied
|
|
|
|
$ hg log -G -T '{desc}'
|
|
@ E
|
|
|
|
|
o D
|
|
|
|
|
o C
|
|
|
|
|
o B
|
|
|
|
|
| x E
|
|
| |
|
|
| | o F
|
|
| | |
|
|
| x | D
|
|
| |/
|
|
| x C
|
|
| |
|
|
| x B
|
|
|/
|
|
o A
|
|
|