# HG changeset patch
# User Vadim Gelfer <vadim.gelfer@gmail.com>
# Date 1147365830 25200
# Node ID fdb699b5e13269aade0a09f5f335dcf41d9db3ed
# Parent  3d48eb68f3ee08cdf3dd8db454d396f30b2564cd
localrepo.update: abort if outstanding merges, instead of warn/return 1


diff -r 3d48eb68f3ee -r fdb699b5e132 mercurial/localrepo.py
--- 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