| Alphare |
| hg-reviewers |
This is related to dirstate adjustment.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/merge.py (8 lines) |
| repo, mresult.actionsdict, branchmerge, getfiledata | repo, mresult.actionsdict, branchmerge, getfiledata | ||||
| ) | ) | ||||
| # update completed, clear state | # update completed, clear state | ||||
| util.unlink(repo.vfs.join(b'updatestate')) | util.unlink(repo.vfs.join(b'updatestate')) | ||||
| if not branchmerge: | if not branchmerge: | ||||
| repo.dirstate.setbranch(p2.branch()) | repo.dirstate.setbranch(p2.branch()) | ||||
| # If we're updating to a location, clean up any stale temporary includes | # If we're updating to a location, clean up any stale temporary includes | ||||
| # (ex: this happens during hg rebase --abort). | # (ex: this happens during hg rebase --abort). | ||||
| if not branchmerge: | if not branchmerge: | ||||
| sparse.prunetemporaryincludes(repo) | sparse.prunetemporaryincludes(repo) | ||||
| if updatedirstate: | if updatedirstate: | ||||
| repo.hook( | repo.hook( | ||||
| b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount | b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount | ||||
| ) | ) | ||||
| return stats | return stats | ||||