Show More
@@ -722,12 +722,13 b' def manifestmerge(repo, wctx, p2, pa, br' | |||||
722 | break |
|
722 | break | |
723 |
|
723 | |||
724 | # Compare manifests |
|
724 | # Compare manifests | |
|
725 | if matcher is not None: | |||
|
726 | m1 = m1.matches(matcher) | |||
|
727 | m2 = m2.matches(matcher) | |||
725 | diff = m1.diff(m2) |
|
728 | diff = m1.diff(m2) | |
726 |
|
729 | |||
727 | actions = {} |
|
730 | actions = {} | |
728 | for f, ((n1, fl1), (n2, fl2)) in diff.iteritems(): |
|
731 | for f, ((n1, fl1), (n2, fl2)) in diff.iteritems(): | |
729 | if matcher and not matcher(f): |
|
|||
730 | continue |
|
|||
731 | if n1 and n2: # file exists on both local and remote side |
|
732 | if n1 and n2: # file exists on both local and remote side | |
732 | if f not in ma: |
|
733 | if f not in ma: | |
733 | fa = copy.get(f, None) |
|
734 | fa = copy.get(f, None) |
General Comments 0
You need to be logged in to leave comments.
Login now