Show More
@@ -439,12 +439,20 b' def filterupdatesactions(repo, wctx, mct' | |||
|
439 | 439 | message, |
|
440 | 440 | ) |
|
441 | 441 | |
|
442 | with repo.dirstate.parentchange(): | |
|
442 | 443 | mergemod.applyupdates( |
|
443 | repo, tmresult, repo[None], repo[b'.'], False, wantfiledata=False | |
|
444 | repo, | |
|
445 | tmresult, | |
|
446 | repo[None], | |
|
447 | repo[b'.'], | |
|
448 | False, | |
|
449 | wantfiledata=False, | |
|
444 | 450 | ) |
|
445 | 451 | |
|
446 | 452 | dirstate = repo.dirstate |
|
447 |
for file, flags, msg in tmresult.getactions( |
|
|
453 | for file, flags, msg in tmresult.getactions( | |
|
454 | [mergestatemod.ACTION_GET] | |
|
455 | ): | |
|
448 | 456 | dirstate.normal(file) |
|
449 | 457 | |
|
450 | 458 | profiles = activeconfig(repo)[2] |
@@ -420,12 +420,12 b' manifest' | |||
|
420 | 420 | We have files in the dirstate that are included and excluded. Some are in the |
|
421 | 421 | manifest and some are not. |
|
422 | 422 | $ hg debugdirstate --no-dates |
|
423 |
n |
|
|
424 |
a |
|
|
425 |
n |
|
|
426 |
a |
|
|
423 | n * excluded (glob) | |
|
424 | a * excludednomanifest (glob) | |
|
425 | n * included (glob) | |
|
426 | a * includedadded (glob) | |
|
427 | 427 | $ hg debugrebuilddirstate --minimal |
|
428 | 428 | $ hg debugdirstate --no-dates |
|
429 |
n |
|
|
430 |
a |
|
|
429 | n * included (glob) | |
|
430 | a * includedadded (glob) | |
|
431 | 431 |
General Comments 0
You need to be logged in to leave comments.
Login now