equal
deleted
inserted
replaced
386 # If we're updating, use the target context's filter, since we're |
386 # If we're updating, use the target context's filter, since we're |
387 # moving to the target context. |
387 # moving to the target context. |
388 sparsematch = matcher(repo, [mctx.rev()]) |
388 sparsematch = matcher(repo, [mctx.rev()]) |
389 |
389 |
390 temporaryfiles = [] |
390 temporaryfiles = [] |
391 for file, action in pycompat.iteritems(mresult.actions): |
391 for file, action in mresult.filemap(): |
392 type, args, msg = action |
392 type, args, msg = action |
393 files.add(file) |
393 files.add(file) |
394 if sparsematch(file): |
394 if sparsematch(file): |
395 prunedactions[file] = action |
395 prunedactions[file] = action |
396 elif type == mergestatemod.ACTION_MERGE: |
396 elif type == mergestatemod.ACTION_MERGE: |