[PATCH 6 of 9] merge: standardize error message for dirty working dir
Siddharth Agarwal
sid0 at fb.com
Mon Sep 23 23:51:03 CDT 2013
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1379994651 25200
# Mon Sep 23 20:50:51 2013 -0700
# Node ID ae55f1484295c2462ae2564d6e05bc8cd4638f53
# Parent b23d3c39a94127cbe90085b3dde47084282f3ed2
merge: standardize error message for dirty working dir
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -711,7 +711,7 @@
hint=_("use 'hg update' "
"or check 'hg heads'"))
if not force and (wc.files() or wc.deleted()):
- raise util.Abort(_("outstanding uncommitted changes"),
+ raise util.Abort(_("uncommitted changes"),
hint=_("use 'hg status' to list changes"))
for s in sorted(wc.substate):
if wc.sub(s).dirty():
diff --git a/tests/test-merge-force.t b/tests/test-merge-force.t
--- a/tests/test-merge-force.t
+++ b/tests/test-merge-force.t
@@ -19,7 +19,7 @@
Should fail, since there are deleted files:
$ hg merge
- abort: outstanding uncommitted changes
+ abort: uncommitted changes
(use 'hg status' to list changes)
[255]
diff --git a/tests/test-merge1.t b/tests/test-merge1.t
--- a/tests/test-merge1.t
+++ b/tests/test-merge1.t
@@ -140,7 +140,7 @@
$ echo This is file b22 > b
merge fails
$ hg merge 2
- abort: outstanding uncommitted changes
+ abort: uncommitted changes
(use 'hg status' to list changes)
[255]
merge expected!
@@ -177,7 +177,7 @@
$ echo This is file b33 > b
merge of b should fail
$ hg merge 2
- abort: outstanding uncommitted changes
+ abort: uncommitted changes
(use 'hg status' to list changes)
[255]
merge of b expected
diff --git a/tests/test-up-local-change.t b/tests/test-up-local-change.t
--- a/tests/test-up-local-change.t
+++ b/tests/test-up-local-change.t
@@ -171,7 +171,7 @@
(commit and merge, or update --clean to discard changes)
[255]
$ hg --debug merge
- abort: outstanding uncommitted changes
+ abort: uncommitted changes
(use 'hg status' to list changes)
[255]
$ hg --debug merge -f
More information about the Mercurial-devel
mailing list