Show More
@@ -439,12 +439,20 b' def filterupdatesactions(repo, wctx, mct' | |||||
439 | message, |
|
439 | message, | |
440 | ) |
|
440 | ) | |
441 |
|
441 | |||
|
442 | with repo.dirstate.parentchange(): | |||
442 | mergemod.applyupdates( |
|
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 | dirstate = repo.dirstate |
|
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 | dirstate.normal(file) |
|
456 | dirstate.normal(file) | |
449 |
|
457 | |||
450 | profiles = activeconfig(repo)[2] |
|
458 | profiles = activeconfig(repo)[2] |
@@ -420,12 +420,12 b' manifest' | |||||
420 | We have files in the dirstate that are included and excluded. Some are in the |
|
420 | We have files in the dirstate that are included and excluded. Some are in the | |
421 | manifest and some are not. |
|
421 | manifest and some are not. | |
422 | $ hg debugdirstate --no-dates |
|
422 | $ hg debugdirstate --no-dates | |
423 |
n |
|
423 | n * excluded (glob) | |
424 |
a |
|
424 | a * excludednomanifest (glob) | |
425 |
n |
|
425 | n * included (glob) | |
426 |
a |
|
426 | a * includedadded (glob) | |
427 | $ hg debugrebuilddirstate --minimal |
|
427 | $ hg debugrebuilddirstate --minimal | |
428 | $ hg debugdirstate --no-dates |
|
428 | $ hg debugdirstate --no-dates | |
429 |
n |
|
429 | n * included (glob) | |
430 |
a |
|
430 | a * includedadded (glob) | |
431 |
|
431 |
General Comments 0
You need to be logged in to leave comments.
Login now