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.
--- 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"""