Mercurial > hg
diff 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 |
line wrap: on
line diff
--- a/mercurial/merge.py Thu Jul 08 21:26:21 2021 +0200 +++ b/mercurial/merge.py Thu Jul 08 22:08:32 2021 +0200 @@ -2149,10 +2149,10 @@ if not branchmerge: repo.dirstate.setbranch(p2.branch()) - # If we're updating to a location, clean up any stale temporary includes - # (ex: this happens during hg rebase --abort). - if not branchmerge: - sparse.prunetemporaryincludes(repo) + # If we're updating to a location, clean up any stale temporary includes + # (ex: this happens during hg rebase --abort). + if not branchmerge: + sparse.prunetemporaryincludes(repo) if updatedirstate: repo.hook(