equal
deleted
inserted
replaced
1375 wlock = self.wlock() |
1375 wlock = self.wlock() |
1376 try: |
1376 try: |
1377 wctx = self[None] |
1377 wctx = self[None] |
1378 merge = len(wctx.parents()) > 1 |
1378 merge = len(wctx.parents()) > 1 |
1379 |
1379 |
1380 if not force and merge and not match.always(): |
1380 if not force and merge and match.ispartial(): |
1381 raise util.Abort(_('cannot partially commit a merge ' |
1381 raise util.Abort(_('cannot partially commit a merge ' |
1382 '(do not specify files or patterns)')) |
1382 '(do not specify files or patterns)')) |
1383 |
1383 |
1384 status = self.status(match=match, clean=force) |
1384 status = self.status(match=match, clean=force) |
1385 if force: |
1385 if force: |