Show More
@@ -1575,7 +1575,7 b' class localrepository(object):' | |||||
1575 | wctx = self[None] |
|
1575 | wctx = self[None] | |
1576 | merge = len(wctx.parents()) > 1 |
|
1576 | merge = len(wctx.parents()) > 1 | |
1577 |
|
1577 | |||
1578 |
if not force and merge and match. |
|
1578 | if not force and merge and not match.always(): | |
1579 | raise error.Abort(_('cannot partially commit a merge ' |
|
1579 | raise error.Abort(_('cannot partially commit a merge ' | |
1580 | '(do not specify files or patterns)')) |
|
1580 | '(do not specify files or patterns)')) | |
1581 |
|
1581 |
@@ -281,14 +281,6 b' class match(object):' | |||||
281 | - optimization might be possible and necessary.''' |
|
281 | - optimization might be possible and necessary.''' | |
282 | return self._always |
|
282 | return self._always | |
283 |
|
283 | |||
284 | def ispartial(self): |
|
|||
285 | '''True if the matcher won't always match. |
|
|||
286 |
|
||||
287 | Although it's just the inverse of _always in this implementation, |
|
|||
288 | an extension such as narrowhg might make it return something |
|
|||
289 | slightly different.''' |
|
|||
290 | return not self._always |
|
|||
291 |
|
||||
292 | def isexact(self): |
|
284 | def isexact(self): | |
293 | return self.matchfn == self.exact |
|
285 | return self.matchfn == self.exact | |
294 |
|
286 |
General Comments 0
You need to be logged in to leave comments.
Login now