Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 47609:c8d6e23fb14a
sparse: adjust the temporary includes within a `parentchange` context
This is related to dirstate adjustment.
Differential Revision: https://phab.mercurial-scm.org/D11033
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 08 Jul 2021 22:08:32 +0200 |
| parents | 9e6e12e1a87e |
| children | 5228a6dc212b 269ff8978086 |
comparison
equal
deleted
inserted
replaced
| 47608:3c0efa0eeea6 | 47609:c8d6e23fb14a |
|---|---|
| 2147 util.unlink(repo.vfs.join(b'updatestate')) | 2147 util.unlink(repo.vfs.join(b'updatestate')) |
| 2148 | 2148 |
| 2149 if not branchmerge: | 2149 if not branchmerge: |
| 2150 repo.dirstate.setbranch(p2.branch()) | 2150 repo.dirstate.setbranch(p2.branch()) |
| 2151 | 2151 |
| 2152 # If we're updating to a location, clean up any stale temporary includes | 2152 # If we're updating to a location, clean up any stale temporary includes |
| 2153 # (ex: this happens during hg rebase --abort). | 2153 # (ex: this happens during hg rebase --abort). |
| 2154 if not branchmerge: | 2154 if not branchmerge: |
| 2155 sparse.prunetemporaryincludes(repo) | 2155 sparse.prunetemporaryincludes(repo) |
| 2156 | 2156 |
| 2157 if updatedirstate: | 2157 if updatedirstate: |
| 2158 repo.hook( | 2158 repo.hook( |
| 2159 b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount | 2159 b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount |
| 2160 ) | 2160 ) |