Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make error message consistent with other commands
authorMartin von Zweigbergk <martinvonz@gmail.com>
Wed, 08 Oct 2014 14:16:53 -0700
changeset 22841 18b3869179f9
parent 22840 ba5c635921e1
child 22844 1533e642262d
merge: make error message consistent with other commands If a merge is attempted when another merge is already ongoing, we give the message "outstanding uncommitted merges". Many other commands (such as backout, rebase, histedit) give the same message in singular form. Since the singular form also seems to make more sense, let's use that for 'hg merge' as well.
mercurial/merge.py file | annotate | diff | comparison | revisions
tests/test-largefiles.t file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Fri Oct 10 10:34:52 2014 -0400
+++ b/mercurial/merge.py	Wed Oct 08 14:16:53 2014 -0700
@@ -1058,7 +1058,7 @@
 
         ### check phase
         if not overwrite and len(pl) > 1:
-            raise util.Abort(_("outstanding uncommitted merges"))
+            raise util.Abort(_("outstanding uncommitted merge"))
         if branchmerge:
             if pas == [p2]:
                 raise util.Abort(_("merging with a working directory ancestor"
--- a/tests/test-largefiles.t	Fri Oct 10 10:34:52 2014 -0400
+++ b/tests/test-largefiles.t	Wed Oct 08 14:16:53 2014 -0700
@@ -1705,7 +1705,7 @@
 - make sure update of merge with removed largefiles fails as expected
   $ hg rm sub2/large6
   $ hg up -r.
-  abort: outstanding uncommitted merges
+  abort: outstanding uncommitted merge
   [255]
 
 - revert should be able to revert files introduced in a pending merge
Mercurial