2019-12-10 02:24:31 +03:00
|
|
|
#chg-compatible
|
|
|
|
|
2020-06-11 03:33:43 +03:00
|
|
|
$ configure mutation-norecord
|
2018-08-01 01:07:08 +03:00
|
|
|
#require rmcwd
|
|
|
|
|
2018-07-30 17:55:49 +03:00
|
|
|
Ensure that dirsync does not cause an abort when cwd goes missing
|
|
|
|
|
|
|
|
$ enable rebase dirsync
|
|
|
|
$ setconfig phases.publish=False
|
|
|
|
|
|
|
|
$ newrepo
|
|
|
|
$ drawdag <<'EOF'
|
|
|
|
> change # change/a = a
|
|
|
|
> |
|
|
|
|
> | delete # delete/dir/a = (removed)
|
|
|
|
> | /
|
|
|
|
> base # base/dir/a = a
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ hg co -q $change
|
|
|
|
$ cd dir
|
|
|
|
|
|
|
|
$ hg rebase -s . -d $delete
|
2021-07-14 01:03:52 +03:00
|
|
|
rebasing * "change" (glob)
|
2018-07-30 17:55:49 +03:00
|
|
|
current directory was removed
|
|
|
|
(consider changing to repo root: $TESTTMP/repo1)
|
|
|
|
|
|
|
|
$ cd -
|
|
|
|
$TESTTMP/repo1
|
|
|
|
$ hg status
|
|
|
|
|
2020-07-02 23:11:57 +03:00
|
|
|
$ hg log -Gr "all()" -T "{node|short} {desc}"
|
2021-07-14 01:03:52 +03:00
|
|
|
@ * change (glob)
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2021-07-14 01:03:52 +03:00
|
|
|
o * delete (glob)
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2021-07-14 01:03:52 +03:00
|
|
|
o * base (glob)
|
2018-07-30 17:55:49 +03:00
|
|
|
|
|
|
|
$ hg rebase --abort
|
2018-07-30 17:55:50 +03:00
|
|
|
abort: no rebase in progress
|
|
|
|
[255]
|