Mercurial > hg-stable
changeset 19802:94c394653b2a
merge: standardize error message for dirty working dir
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Mon, 23 Sep 2013 20:50:51 -0700 |
| parents | 41abe2e3e3b7 |
| children | 0f64af33fb63 |
| files | mercurial/merge.py tests/test-merge-force.t tests/test-merge1.t tests/test-up-local-change.t |
| diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Mon Sep 23 20:33:02 2013 -0700 +++ b/mercurial/merge.py Mon Sep 23 20:50:51 2013 -0700 @@ -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():
--- a/tests/test-merge-force.t Mon Sep 23 20:33:02 2013 -0700 +++ b/tests/test-merge-force.t Mon Sep 23 20:50:51 2013 -0700 @@ -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]
--- a/tests/test-merge1.t Mon Sep 23 20:33:02 2013 -0700 +++ b/tests/test-merge1.t Mon Sep 23 20:50:51 2013 -0700 @@ -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
--- a/tests/test-up-local-change.t Mon Sep 23 20:33:02 2013 -0700 +++ b/tests/test-up-local-change.t Mon Sep 23 20:50:51 2013 -0700 @@ -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