Mercurial > hg > crecord

changeset 66:f7f6a04cc6f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Abort when trying to crecord a merge Analogous to feb2a58fc592 in main.
author Christian Ebert <blacktrash@gmx.net>
date Sun, 11 Jul 2010 23:16:42 +0200
parents 67bcb8929132
children 0e26a397af52
files crecord/__init__.py crecord/crecord_core.py
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/crecord/__init__.py
+++ b/crecord/__init__.py
@@ -24,7 +24,8 @@
     You will be shown a list of patch hunks from which you can select
     those you would like to apply to the commit.
 
-    '''
+    This command is not available when committing a merge.'''
+
     dorecord(ui, repo, commands.commit, *pats, **opts)
 
 
--- a/crecord/crecord_core.py
+++ b/crecord/crecord_core.py
@@ -36,6 +36,12 @@
         In the end we'll record interesting changes, and everything else will be
         left in place, so the user can continue his work.
         """
+
+        merge = len(repo[None].parents()) > 1
+        if merge:
+            raise util.Abort(_('cannot partially commit a merge '
+                               '(use hg commit instead)'))
+
         if match.files():
             changes = None
         else: