equal
deleted
inserted
replaced
1715 fp.write(chunk) |
1715 fp.write(chunk) |
1716 err = 0 |
1716 err = 0 |
1717 return err |
1717 return err |
1718 |
1718 |
1719 |
1719 |
1720 @eh.wrapfunction(merge, b'update') |
1720 @eh.wrapfunction(merge, b'_update') |
1721 def mergeupdate(orig, repo, node, branchmerge, force, *args, **kwargs): |
1721 def mergeupdate(orig, repo, node, branchmerge, force, *args, **kwargs): |
1722 matcher = kwargs.get('matcher', None) |
1722 matcher = kwargs.get('matcher', None) |
1723 # note if this is a partial update |
1723 # note if this is a partial update |
1724 partial = matcher and not matcher.always() |
1724 partial = matcher and not matcher.always() |
1725 with repo.wlock(): |
1725 with repo.wlock(): |