mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +03:00
e8e68cb945
Summary: Switch to modern configs. It does not quite work right yet, which will be fixed in follow-ups. Reviewed By: DurhamG Differential Revision: D22174966 fbshipit-source-id: d52234ec588a3a92512635291f64fa1819a4424b
60 lines
1.1 KiB
Perl
60 lines
1.1 KiB
Perl
#chg-compatible
|
|
|
|
$ enable rebase
|
|
$ setconfig experimental.evolution.allowdivergence=1
|
|
|
|
$ newrepo repo
|
|
$ drawdag <<'EOS'
|
|
> D # D is orphaned.
|
|
> |
|
|
> C2 C C1 # amend: C -> C1 -> C2
|
|
> \|/
|
|
> B Z
|
|
> |/
|
|
> A
|
|
> EOS
|
|
|
|
$ cp -R ../repo ../repob
|
|
|
|
FIXME: This does not quite work yet with singletransaction.
|
|
|
|
$ hg rebase -s $B -d $Z --config rebase.singletransaction=true
|
|
rebasing 112478962961 "B"
|
|
rebasing 26805aba1e60 "C"
|
|
rebasing f585351a92f8 "D"
|
|
rebasing 039c3379aaa9 "C2"
|
|
$ hg log -G -T '{node|short} {desc}'
|
|
o b97425e89b0c C2
|
|
|
|
|
| o f7f4f5b9173a D
|
|
| |
|
|
| o e709467ba6ed C
|
|
|/
|
|
o d74d19e598c8 B
|
|
|
|
|
o 262e37e34f63 Z
|
|
|
|
|
o 426bada5c675 A
|
|
|
|
FIXME: This does not quite work yet without singletransaction.
|
|
|
|
$ cd $TESTTMP/repob
|
|
$ hg rebase -s $B -d $Z --config rebase.singletransaction=false
|
|
rebasing 112478962961 "B"
|
|
rebasing 26805aba1e60 "C"
|
|
rebasing f585351a92f8 "D"
|
|
rebasing 039c3379aaa9 "C2"
|
|
$ hg log -G -T '{node|short} {desc}'
|
|
o b97425e89b0c C2
|
|
|
|
|
| o f7f4f5b9173a D
|
|
| |
|
|
| o e709467ba6ed C
|
|
|/
|
|
o d74d19e598c8 B
|
|
|
|
|
o 262e37e34f63 Z
|
|
|
|
|
o 426bada5c675 A
|
|
|