##// END OF EJS Templates
graft: refuse to commit an interrupted graft (issue3667)
Simon King -
r19253:e078ea9b stable
parent child Browse files
Show More
@@ -1315,6 +1315,10 b' def commit(ui, repo, *pats, **opts):'
1315 1315 # Let --subrepos on the command line override config setting.
1316 1316 ui.setconfig('ui', 'commitsubrepos', True)
1317 1317
1318 if repo.vfs.exists('graftstate'):
1319 raise util.Abort(_('cannot commit an interrupted graft operation'),
1320 hint=_('use "hg graft -c" to continue graft'))
1321
1318 1322 extra = {}
1319 1323 if opts.get('close_branch'):
1320 1324 extra['close'] = 1
@@ -174,6 +174,13 b' Graft out of order, skipping a merge and'
174 174 (use hg resolve and hg graft --continue)
175 175 [255]
176 176
177 Commit while interrupted should fail:
178
179 $ hg ci -m 'commit interrupted graft'
180 abort: cannot commit an interrupted graft operation
181 (use "hg graft -c" to continue graft)
182 [255]
183
177 184 Continue without resolve should fail:
178 185
179 186 $ hg graft -c
General Comments 0
You need to be logged in to leave comments. Login now