Mercurial > public > mercurial-scm > hg-stable
diff tests/test-rebase-parameters.t @ 44301:830eae18b2f3
rebase: abort if the user tries to rebase the working copy
I think it's more correct to treat `hg rebase -r 'wdir()' -d foo`
as `hg co -m foo`, but I'm instead making it error out. That's partly
because it's probably what the user wanted (in the case I heard from a
user, they had done `hg rebase -s f` where `f` resolved to `wdir()`)
and partly because I don't want to think about more complicated cases
where the user specifies the working copy together with other commits.
Differential Revision: https://phab.mercurial-scm.org/D8057
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 31 Jan 2020 10:53:50 -0800 |
| parents | 6e4ff6a766c2 |
| children | 9c9cfecd4600 |
line wrap: on
line diff
--- a/tests/test-rebase-parameters.t Fri Jan 31 10:41:50 2020 -0800 +++ b/tests/test-rebase-parameters.t Fri Jan 31 10:53:50 2020 -0800 @@ -93,11 +93,12 @@ [1] $ hg rebase --rev 'wdir()' --dest 6 - abort: working directory revision cannot be specified + abort: cannot rebase the working copy [255] - $ hg rebase --source 'wdir()' --dest 6 2>&1 | grep assert - assert rebaseset + $ hg rebase --source 'wdir()' --dest 6 + abort: cannot rebase the working copy + [255] $ hg rebase --source '1 & !1' --dest 8 empty "source" revision set - nothing to rebase