mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 14:58:03 +03:00
e1c73204f6
Summary: A future diff will remove tags entirely, so let's move drawdag to be bookmark based. Reviewed By: quark-zju Differential Revision: D18995059 fbshipit-source-id: 70ef67259b37ef9821009d0145aa1e03c09b1309
71 lines
1.4 KiB
Raku
71 lines
1.4 KiB
Raku
#chg-compatible
|
|
|
|
$ . helpers-usechg.sh
|
|
$ enable amend rebase
|
|
$ setconfig rebase.experimental.inmemory=True
|
|
$ setconfig rebase.singletransaction=True
|
|
$ setconfig experimental.evolution.allowdivergence=True
|
|
$ setconfig experimental.evolution="createmarkers, allowunstable"
|
|
$ setconfig amend.autorestack=no-conflict
|
|
$ mkcommit() {
|
|
> echo "$1" > "$1"
|
|
> hg add "$1"
|
|
> hg ci -m "add $1"
|
|
> }
|
|
|
|
Test invalid value for amend.autorestack
|
|
$ newrepo
|
|
$ hg debugdrawdag<<'EOS'
|
|
> D
|
|
> |
|
|
> C C_old
|
|
> | | # amend: B_old -> B
|
|
> B B_old # amend: C_old -> C
|
|
> | /
|
|
> |/
|
|
> A
|
|
> EOS
|
|
$ hg update -qC B
|
|
$ echo "new content" > B
|
|
$ showgraph
|
|
o 5 3c36beb5705f D
|
|
|
|
|
x 4 07863d11c289 C_old
|
|
|
|
|
| o 3 26805aba1e60 C
|
|
| |
|
|
x | 2 3326d5194fc9 B_old
|
|
| |
|
|
| @ 1 112478962961 B
|
|
|/
|
|
o 0 426bada5c675 A
|
|
$ hg amend -m "B'"
|
|
restacking children automatically (unless they conflict)
|
|
rebasing 26805aba1e60 "C" (C)
|
|
$ showgraph
|
|
o 7 5676eb48a524 C
|
|
|
|
|
@ 6 180681c3ccd0 B'
|
|
|
|
|
| o 5 3c36beb5705f D
|
|
| |
|
|
| x 4 07863d11c289 C_old
|
|
| |
|
|
| x 2 3326d5194fc9 B_old
|
|
|/
|
|
o 0 426bada5c675 A
|
|
$ hg rebase --restack
|
|
rebasing 3c36beb5705f "D" (D)
|
|
$ showgraph
|
|
o 8 d1e904d06977 D
|
|
|
|
|
o 7 5676eb48a524 C
|
|
|
|
|
@ 6 180681c3ccd0 B'
|
|
|
|
|
| x 4 07863d11c289 C_old
|
|
| |
|
|
| x 2 3326d5194fc9 B_old
|
|
|/
|
|
o 0 426bada5c675 A
|