Patchwork [7,of,9] merge: standardize error message for dirty subrepo

login
register
mail settings
Submitter Siddharth Agarwal
Date Sept. 24, 2013, 4:51 a.m.
Message ID <810004375c9648296a47.1379998264@dev1091.prn1.facebook.com>
Download mbox | patch
Permalink /patch/2619/
State Superseded
Commit 9bfa86746c9c1f6ab51deb8f174ffc482417d09f
Headers show

Comments

Siddharth Agarwal - Sept. 24, 2013, 4:51 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1379994794 25200
#      Mon Sep 23 20:53:14 2013 -0700
# Node ID 810004375c9648296a4716567f63a541f7ecc70c
# Parent  ae55f1484295c2462ae2564d6e05bc8cd4638f53
merge: standardize error message for dirty subrepo

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -715,7 +715,7 @@ 
                                  hint=_("use 'hg status' to list changes"))
             for s in sorted(wc.substate):
                 if wc.sub(s).dirty():
-                    raise util.Abort(_("outstanding uncommitted changes in "
+                    raise util.Abort(_("uncommitted changes in "
                                        "subrepository '%s'") % s)
 
         elif not overwrite:
diff --git a/tests/test-merge-subrepos.t b/tests/test-merge-subrepos.t
--- a/tests/test-merge-subrepos.t
+++ b/tests/test-merge-subrepos.t
@@ -21,5 +21,5 @@ 
 Should fail, since there are added files to subrepo:
 
   $ hg merge
-  abort: outstanding uncommitted changes in subrepository 'subrepo'
+  abort: uncommitted changes in subrepository 'subrepo'
   [255]