Mercurial > hg
diff mercurial/commands.py @ 19234:7bbad79b9542
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 23 May 2013 17:52:21 -0500 |
parents | 6cf8e3b4e074 b592fd33233a |
children | 043abd6a91d1 |
line wrap: on
line diff
--- a/mercurial/commands.py Wed May 15 15:44:59 2013 +0900 +++ b/mercurial/commands.py Thu May 23 17:52:21 2013 -0500 @@ -1325,6 +1325,8 @@ Returns 0 on success, 1 if nothing changed. """ if opts.get('subrepos'): + if opts.get('amend'): + raise util.Abort(_('cannot amend with --subrepos')) # Let --subrepos on the command line override config setting. ui.setconfig('ui', 'commitsubrepos', True) @@ -1337,7 +1339,7 @@ if opts.get('amend'): if ui.configbool('ui', 'commitsubrepos'): - raise util.Abort(_('cannot amend recursively')) + raise util.Abort(_('cannot amend with ui.commitsubrepos enabled')) old = repo['.'] if old.phase() == phases.public: