--- a/mercurial/cmdutil.py	Wed Nov 26 14:27:36 2014 -0500
+++ b/mercurial/cmdutil.py	Wed Nov 26 15:16:22 2014 -0500
@@ -2202,7 +2202,9 @@
     # extract addremove carefully -- this function can be called from a command
     # that doesn't support addremove
     if opts.get('addremove'):
-        scmutil.addremove(repo, matcher, opts)
+        if scmutil.addremove(repo, matcher, opts) != 0:
+            raise util.Abort(
+                _("failed to mark all new/missing files as added/removed"))
 
     return commitfunc(ui, repo, message, matcher, opts)