##// END OF EJS Templates
commit: abort if --addremove is specified, but fails...
Matt Harbison -
r23535:72c23fa4 default
parent child Browse files
Show More
@@ -2202,7 +2202,9 b' def commit(ui, repo, commitfunc, pats, o'
2202 # extract addremove carefully -- this function can be called from a command
2202 # extract addremove carefully -- this function can be called from a command
2203 # that doesn't support addremove
2203 # that doesn't support addremove
2204 if opts.get('addremove'):
2204 if opts.get('addremove'):
2205 scmutil.addremove(repo, matcher, opts)
2205 if scmutil.addremove(repo, matcher, opts) != 0:
2206 raise util.Abort(
2207 _("failed to mark all new/missing files as added/removed"))
2206
2208
2207 return commitfunc(ui, repo, message, matcher, opts)
2209 return commitfunc(ui, repo, message, matcher, opts)
2208
2210
@@ -79,4 +79,19 b''
79 $ hg addremove -s 50
79 $ hg addremove -s 50
80 adding b
80 adding b
81 adding c
81 adding c
82
83 $ rm c
84 #if windows
85 $ hg ci -A -m "c" nonexistant
86 nonexistant: The system cannot find the file specified
87 abort: failed to mark all new/missing files as added/removed
88 [255]
89 #else
90 $ hg ci -A -m "c" nonexistant
91 nonexistant: No such file or directory
92 abort: failed to mark all new/missing files as added/removed
93 [255]
94 #endif
95 $ hg st
96 ! c
82 $ cd ..
97 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now