equal
deleted
inserted
replaced
334 prunedactions = {} |
334 prunedactions = {} |
335 |
335 |
336 if branchmerge: |
336 if branchmerge: |
337 # If we're merging, use the wctx filter, since we're merging into |
337 # If we're merging, use the wctx filter, since we're merging into |
338 # the wctx. |
338 # the wctx. |
339 sparsematch = matcher(repo, [wctx.parents()[0].rev()]) |
339 sparsematch = matcher(repo, [wctx.p1().rev()]) |
340 else: |
340 else: |
341 # If we're updating, use the target context's filter, since we're |
341 # If we're updating, use the target context's filter, since we're |
342 # moving to the target context. |
342 # moving to the target context. |
343 sparsematch = matcher(repo, [mctx.rev()]) |
343 sparsematch = matcher(repo, [mctx.rev()]) |
344 |
344 |