[PATCH 7 of 9] merge: standardize error message for dirty subrepo
Siddharth Agarwal
sid0 at fb.com
Tue Sep 24 04:51:04 UTC 2013
# HG changeset patch
# User Siddharth Agarwal <sid0 at 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
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]
More information about the Mercurial-devel
mailing list