Mercurial > hg

changeset 19258:cceaf7af4c9e stable 2.6.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with i18n
author Matt Mackall <mpm@selenic.com>
date Sat, 01 Jun 2013 17:09:41 -0500
parents e078ea9b4ce4 (diff) b9dff23220f3 (current diff)
children 02ce3b49bd3e
files
diffstat 2 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Sat Jun 01 01:13:36 2013 +0900
+++ b/mercurial/commands.py	Sat Jun 01 17:09:41 2013 -0500
@@ -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
--- a/tests/test-graft.t	Sat Jun 01 01:13:36 2013 +0900
+++ b/tests/test-graft.t	Sat Jun 01 17:09:41 2013 -0500
@@ -174,6 +174,13 @@
   (use hg resolve and hg graft --continue)
   [255]
 
+Commit while interrupted should fail:
+
+  $ hg ci -m 'commit interrupted graft'
+  abort: cannot commit an interrupted graft operation
+  (use "hg graft -c" to continue graft)
+  [255]
+
 Continue without resolve should fail:
 
   $ hg graft -c