Show More
@@ -275,7 +275,7 b' def prunetemporaryincludes(repo):' | |||
|
275 | 275 | for file in tempincludes: |
|
276 | 276 | if file in dirstate and not sparsematch(file): |
|
277 | 277 | message = _(b'dropping temporarily included sparse files') |
|
278 |
mresult.addfile(file, |
|
|
278 | mresult.addfile(file, mergestatemod.ACTION_REMOVE, None, message) | |
|
279 | 279 | dropped.append(file) |
|
280 | 280 | |
|
281 | 281 | mergemod.applyupdates( |
@@ -516,17 +516,19 b' def refreshwdir(repo, origstatus, origsp' | |||
|
516 | 516 | if (new and not old) or (old and new and not file in dirstate): |
|
517 | 517 | fl = mf.flags(file) |
|
518 | 518 | if repo.wvfs.exists(file): |
|
519 |
mresult.addfile(file, |
|
|
519 | mresult.addfile(file, mergestatemod.ACTION_EXEC, (fl,), b'') | |
|
520 | 520 | lookup.append(file) |
|
521 | 521 | else: |
|
522 |
mresult.addfile( |
|
|
522 | mresult.addfile( | |
|
523 | file, mergestatemod.ACTION_GET, (fl, False), b'' | |
|
524 | ) | |
|
523 | 525 | added.append(file) |
|
524 | 526 | # Drop files that are newly excluded, or that still exist in |
|
525 | 527 | # the dirstate. |
|
526 | 528 | elif (old and not new) or (not old and not new and file in dirstate): |
|
527 | 529 | dropped.append(file) |
|
528 | 530 | if file not in pending: |
|
529 |
mresult.addfile(file, |
|
|
531 | mresult.addfile(file, mergestatemod.ACTION_REMOVE, [], b'') | |
|
530 | 532 | |
|
531 | 533 | # Verify there are no pending changes in newly included files |
|
532 | 534 | abort = False |
General Comments 0
You need to be logged in to leave comments.
Login now