Mercurial > hg

changeset 2264:fdb699b5e132

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo.update: abort if outstanding merges, instead of warn/return 1
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 11 May 2006 09:43:50 -0700
parents 3d48eb68f3ee
children 3e4a1a0739c2
files mercurial/localrepo.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Thu May 11 08:48:52 2006 -0700
+++ b/mercurial/localrepo.py	Thu May 11 09:43:50 2006 -0700
@@ -1564,8 +1564,7 @@
                moddirstate=True, forcemerge=False, wlock=None, show_stats=True):
         pl = self.dirstate.parents()
         if not force and pl[1] != nullid:
-            self.ui.warn(_("aborting: outstanding uncommitted merges\n"))
-            return 1
+            raise util.Abort(_("outstanding uncommitted merges"))
 
         err = False