Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 19253:e078ea9b4ce4 stable
graft: refuse to commit an interrupted graft (issue3667)
author | Simon King <simon@simonking.org.uk> |
---|---|
date | Thu, 30 May 2013 22:32:10 +0100 |
parents | b592fd33233a |
children | 043abd6a91d1 b500a663a2c7 |
line wrap: on
line diff
--- a/mercurial/commands.py Thu May 23 17:53:19 2013 -0500 +++ b/mercurial/commands.py Thu May 30 22:32:10 2013 +0100 @@ -1315,6 +1315,10 @@ # Let --subrepos on the command line override config setting. ui.setconfig('ui', 'commitsubrepos', True) + if repo.vfs.exists('graftstate'): + raise util.Abort(_('cannot commit an interrupted graft operation'), + hint=_('use "hg graft -c" to continue graft')) + extra = {} if opts.get('close_branch'): extra['close'] = 1