Mercurial > hg
changeset 30904:76a1e735449c
destutil: remove dead code about non-linear updates
IIUC, the non-linear updates no longer happen by default since
6b1fc09c699a (update: change default destination to tipmost descendant
(issue4673) (BC), 2016-02-02), and it was only if they happened by
default that we used to error out, so there is no longer a need to
handle this case.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 07 Feb 2017 13:11:30 -0800 |
| parents | dd995a5db8fd |
| children | 6037caa6a2f3 |
| files | mercurial/destutil.py |
| diffstat | 1 files changed, 0 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/destutil.py Thu Feb 09 09:55:31 2017 -0800 +++ b/mercurial/destutil.py Tue Feb 07 13:11:30 2017 -0800 @@ -37,10 +37,6 @@ hint = _("commit and merge, or update --clean to" " discard changes") raise error.UpdateAbort(msg, hint=hint) - elif not check: # destination is not a descendant. - msg = _("not a linear update") - hint = _("merge or update --check to force update") - raise error.UpdateAbort(msg, hint=hint) def _destupdateobs(repo, clean, check): """decide of an update destination from obsolescence markers"""