Christian Ebert avatar Christian Ebert committed f7f6a04

Abort when trying to crecord a merge

Analogous to feb2a58fc592 in main.

Comments (0)

Files changed (2)


     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)


         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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.