Mercurial Mercurial > mercurial / 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 26683 634666c48b7d
parent 26641 5c57d01fe64e
child 26714 9903261dcc81 
--- a/mercurial/destutil.py	Mon Oct 05 21:42:09 2015 -0700
+++ b/mercurial/destutil.py	Mon Oct 05 04:26:26 2015 -0700
@@ -84,10 +84,10 @@
                     msg = _("uncommitted changes")
                     hint = _("commit and merge, or update --clean to"
                              " discard changes")
-                    raise error.Abort(msg, hint=hint)
+                    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.Abort(msg, hint=hint)
+                    raise error.UpdateAbort(msg, hint=hint)
 
     return rev, movemark, activemark
mercurial