mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
9bf6b674a6
Summary: Change the legacy Python graph render to Rust renderer. Reviewed By: DurhamG Differential Revision: D24317802 fbshipit-source-id: 4c3dc3a6dd02b7ebe79596a8e77f4b6b139d2e20
102 lines
2.1 KiB
Perl
102 lines
2.1 KiB
Perl
#chg-compatible
|
|
|
|
Test new conflict switching:
|
|
|
|
$ configure mutation-norecord
|
|
$ newrepo
|
|
$ enable amend morestatus rebase
|
|
$ setconfig morestatus.show=True
|
|
$ setconfig rebase.singletransaction=True
|
|
$ setconfig rebase.experimental.inmemory=True
|
|
$ setconfig rebase.experimental.inmemorywarning="rebasing in-memory!"
|
|
|
|
$ hg debugdrawdag <<'EOS'
|
|
> f
|
|
> |
|
|
> e
|
|
> |
|
|
> c d
|
|
> |/
|
|
> b g
|
|
> |/
|
|
> a
|
|
> EOS
|
|
|
|
Make conflicts halfway up the stack:
|
|
$ hg up -C f
|
|
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark f)
|
|
$ echo "conflict" > c
|
|
$ hg add c
|
|
$ hg amend -q
|
|
$ hg rebase -q -s g -d .
|
|
rebasing in-memory!
|
|
$ hg log -G -r 'desc(a)':: -T '{desc}'
|
|
o g
|
|
│
|
|
@ f
|
|
│
|
|
o e
|
|
│
|
|
o d
|
|
│
|
|
│ o c
|
|
├─╯
|
|
o b
|
|
│
|
|
o a
|
|
|
|
$ cp -R . ../control
|
|
$ hg rebase -d c
|
|
rebasing in-memory!
|
|
rebasing f4016ed9f5d0 "d" (d)
|
|
rebasing 881eb15e0fdf "e" (e)
|
|
rebasing e692c3b32196 "f" (f)
|
|
merging c
|
|
hit merge conflicts (in c); switching to on-disk merge
|
|
rebasing e692c3b32196 "f" (f)
|
|
merging c
|
|
warning: 1 conflicts while merging c! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
$ hg resolve --all --tool :other
|
|
(no more unresolved files)
|
|
continue: hg rebase --continue
|
|
$ hg rebase --continue
|
|
already rebased f4016ed9f5d0 "d" (d) as 32bb4413a7df
|
|
already rebased 881eb15e0fdf "e" (e) as d82c41319fdd
|
|
rebasing e692c3b32196 "f" (f)
|
|
rebasing 2a19607ff85c "g" (g)
|
|
$ hg log -G -r 'desc(a)':: -T '{desc} {node|short}'
|
|
o g 24c12a3229e2
|
|
│
|
|
@ f c33e7f678afd
|
|
│
|
|
o e d82c41319fdd
|
|
│
|
|
o d 32bb4413a7df
|
|
│
|
|
o c a82ac2b38757
|
|
│
|
|
o b 488e1b7e7341
|
|
│
|
|
o a b173517d0057
|
|
|
|
|
|
Try it with uncommitted changes, ensure it aborts nicely:
|
|
|
|
$ hg up -Cq a
|
|
$ hg clean
|
|
$ echo "test" > a
|
|
$ hg rebase -s d82c41319fdd -d a
|
|
rebasing in-memory!
|
|
rebasing d82c41319fdd "e" (e)
|
|
rebasing c33e7f678afd "f" (f)
|
|
abort: must use on-disk merge for this rebase (hit merge conflicts in c), but you have working copy changes
|
|
(commit, revert, or shelve them)
|
|
[255]
|
|
$ hg st
|
|
M a
|
|
$ cat a
|
|
test
|