equal
deleted
inserted
replaced
359 elif type == 'f': |
359 elif type == 'f': |
360 prunedactions[file] = action |
360 prunedactions[file] = action |
361 elif file in wctx: |
361 elif file in wctx: |
362 prunedactions[file] = ('r', args, msg) |
362 prunedactions[file] = ('r', args, msg) |
363 |
363 |
|
364 if branchmerge and type == mergemod.ACTION_MERGE: |
|
365 f1, f2, fa, move, anc = args |
|
366 if not sparsematch(f1): |
|
367 temporaryfiles.append(f1) |
|
368 |
364 if len(temporaryfiles) > 0: |
369 if len(temporaryfiles) > 0: |
365 repo.ui.status(_('temporarily included %d file(s) in the sparse ' |
370 repo.ui.status(_('temporarily included %d file(s) in the sparse ' |
366 'checkout for merging\n') % len(temporaryfiles)) |
371 'checkout for merging\n') % len(temporaryfiles)) |
367 addtemporaryincludes(repo, temporaryfiles) |
372 addtemporaryincludes(repo, temporaryfiles) |
368 |
373 |