2019-12-10 02:24:31 +03:00
|
|
|
#chg-compatible
|
|
|
|
|
2018-06-14 21:18:27 +03:00
|
|
|
Test new conflict switching:
|
|
|
|
|
2020-01-25 01:45:01 +03:00
|
|
|
$ configure mutation-norecord
|
2018-06-14 21:18:27 +03:00
|
|
|
$ newrepo
|
2020-01-22 07:45:48 +03:00
|
|
|
$ enable amend morestatus rebase
|
2018-06-19 22:15:18 +03:00
|
|
|
$ setconfig morestatus.show=True
|
2018-06-20 01:31:17 +03:00
|
|
|
$ setconfig rebase.singletransaction=True
|
2018-06-14 21:18:27 +03:00
|
|
|
$ 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
|
2019-12-17 05:10:38 +03:00
|
|
|
(activating bookmark f)
|
2018-06-14 21:18:27 +03:00
|
|
|
$ echo "conflict" > c
|
|
|
|
$ hg add c
|
|
|
|
$ hg amend -q
|
|
|
|
$ hg rebase -q -s g -d .
|
|
|
|
rebasing in-memory!
|
2020-10-08 21:06:31 +03:00
|
|
|
$ hg log -G -r 'desc(a)':: -T '{desc}'
|
2018-06-14 21:18:27 +03:00
|
|
|
o g
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2018-06-14 21:18:27 +03:00
|
|
|
@ f
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2018-06-14 21:18:27 +03:00
|
|
|
o e
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2018-06-14 21:18:27 +03:00
|
|
|
o d
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
│ o c
|
|
|
|
├─╯
|
2019-12-17 05:10:38 +03:00
|
|
|
o b
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2018-06-14 21:18:27 +03:00
|
|
|
o a
|
|
|
|
|
|
|
|
$ cp -R . ../control
|
|
|
|
$ hg rebase -d c
|
|
|
|
rebasing in-memory!
|
2019-10-16 02:28:01 +03:00
|
|
|
rebasing f4016ed9f5d0 "d" (d)
|
|
|
|
rebasing 881eb15e0fdf "e" (e)
|
2019-12-17 05:10:38 +03:00
|
|
|
rebasing e692c3b32196 "f" (f)
|
2018-06-14 21:18:27 +03:00
|
|
|
merging c
|
2018-07-02 21:24:57 +03:00
|
|
|
hit merge conflicts (in c); switching to on-disk merge
|
2019-12-17 05:10:38 +03:00
|
|
|
rebasing e692c3b32196 "f" (f)
|
2018-06-14 21:18:27 +03:00
|
|
|
merging c
|
2018-10-22 22:45:46 +03:00
|
|
|
warning: 1 conflicts while merging c! (edit, then use 'hg resolve --mark')
|
2018-06-14 21:18:27 +03:00
|
|
|
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
|
2019-10-16 02:28:01 +03:00
|
|
|
already rebased f4016ed9f5d0 "d" (d) as 32bb4413a7df
|
|
|
|
already rebased 881eb15e0fdf "e" (e) as d82c41319fdd
|
2019-12-17 05:10:38 +03:00
|
|
|
rebasing e692c3b32196 "f" (f)
|
|
|
|
rebasing 2a19607ff85c "g" (g)
|
2020-10-08 21:06:31 +03:00
|
|
|
$ hg log -G -r 'desc(a)':: -T '{desc} {node|short}'
|
2020-10-08 06:58:22 +03:00
|
|
|
o g 24c12a3229e2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-10-08 06:58:22 +03:00
|
|
|
@ f c33e7f678afd
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-10-08 06:58:22 +03:00
|
|
|
o e d82c41319fdd
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-10-08 06:58:22 +03:00
|
|
|
o d 32bb4413a7df
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-10-08 06:58:22 +03:00
|
|
|
o c a82ac2b38757
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-10-08 06:58:22 +03:00
|
|
|
o b 488e1b7e7341
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-10-08 06:58:22 +03:00
|
|
|
o a b173517d0057
|
2018-06-14 21:18:27 +03:00
|
|
|
|
|
|
|
|
|
|
|
Try it with uncommitted changes, ensure it aborts nicely:
|
|
|
|
|
|
|
|
$ hg up -Cq a
|
2018-06-19 22:15:18 +03:00
|
|
|
$ hg clean
|
2018-06-14 21:18:27 +03:00
|
|
|
$ echo "test" > a
|
|
|
|
$ hg rebase -s d82c41319fdd -d a
|
|
|
|
rebasing in-memory!
|
2019-12-17 05:10:38 +03:00
|
|
|
rebasing d82c41319fdd "e" (e)
|
|
|
|
rebasing c33e7f678afd "f" (f)
|
2018-07-02 21:24:57 +03:00
|
|
|
abort: must use on-disk merge for this rebase (hit merge conflicts in c), but you have working copy changes
|
2018-06-14 21:18:27 +03:00
|
|
|
(commit, revert, or shelve them)
|
|
|
|
[255]
|
2018-06-19 22:15:18 +03:00
|
|
|
$ hg st
|
|
|
|
M a
|
|
|
|
$ cat a
|
|
|
|
test
|