Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/destutil.py
changeset 30904 76a1e735449c
parent 30332 318a24b52eeb
child 30961 330fbd515512 
--- 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"""
Mercurial