Mercurial > hg-stable

changeset 19803:0f64af33fb63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: standardize error message for dirty subrepo
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Sep 2013 20:53:14 -0700
parents 94c394653b2a
children 061ce98c888d
files mercurial/merge.py tests/test-merge-subrepos.t
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Sep 23 20:50:51 2013 -0700
+++ b/mercurial/merge.py	Mon Sep 23 20:53:14 2013 -0700
@@ -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:
--- a/tests/test-merge-subrepos.t	Mon Sep 23 20:50:51 2013 -0700
+++ b/tests/test-merge-subrepos.t	Mon Sep 23 20:53:14 2013 -0700
@@ -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]