Mercurial > hg > gitweb

changeset 2265:3e4a1a0739c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 11 May 2006 09:44:11 -0700
parents fdb699b5e132 (diff) 2f64cbaa1e92 (current diff)
children 3f7692b0ff13
files
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Thu May 11 09:01:32 2006 -0700
+++ b/mercurial/localrepo.py	Thu May 11 09:44:11 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