mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
644ec66f6f
Summary: With the obsmarker copying feature, rebasing revs containing obsolete relationship would result in the markers being copied correctly. Reviewed By: phillco Differential Revision: D7121486 fbshipit-source-id: a666ad65c2eccbfd26db813d4f792c66489ead8c
33 lines
625 B
Raku
33 lines
625 B
Raku
$ enable rebase obsstore
|
|
$ setconfig experimental.evolution.allowdivergence=1
|
|
|
|
$ newrepo
|
|
$ drawdag <<'EOS'
|
|
> D # D is orphaned.
|
|
> |
|
|
> C2 C C1 # amend: C -> C1 -> C2
|
|
> \|/
|
|
> B Z
|
|
> |/
|
|
> A
|
|
> EOS
|
|
|
|
$ hg rebase -s $B -d $Z
|
|
rebasing 1:112478962961 "B"
|
|
rebasing 5:039c3379aaa9 "C2"
|
|
rebasing 3:26805aba1e60 "C"
|
|
rebasing 6:f585351a92f8 "D" (tip)
|
|
$ hg log -G -T '{node|short} {desc} {obsfate}'
|
|
o f7f4f5b9173a D
|
|
|
|
|
x e709467ba6ed C rewritten using copy as 8:b97425e89b0c
|
|
|
|
|
| o b97425e89b0c C2
|
|
|/
|
|
o d74d19e598c8 B
|
|
|
|
|
o 262e37e34f63 Z
|
|
|
|
|
o 426bada5c675 A
|
|
|