Mercurial > hg-stable
diff mercurial/cmdutil.py @ 23537:f1b06a8aad42
commit: propagate --addremove to subrepos if -S is specified (issue3759)
The recursive addremove operation occurs completely before the first subrepo is
committed. Only hg subrepos support the addremove operation at the moment- svn
and git subrepos will warn and abort the commit.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Mon, 24 Nov 2014 22:27:49 -0500 |
| parents | 72c23fa4f52f |
| children | 70a7478c33de |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Wed Nov 26 16:13:38 2014 -0500 +++ b/mercurial/cmdutil.py Mon Nov 24 22:27:49 2014 -0500 @@ -2202,7 +2202,7 @@ # extract addremove carefully -- this function can be called from a command # that doesn't support addremove if opts.get('addremove'): - if scmutil.addremove(repo, matcher, opts) != 0: + if scmutil.addremove(repo, matcher, "", opts) != 0: raise util.Abort( _("failed to mark all new/missing files as added/removed"))