Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sparse: adjust the temporary includes within a `parentchange` context
authorPierre-Yves David <pierre-yves.david@octobus.net>
Thu, 08 Jul 2021 22:08:32 +0200
changeset 47609 c8d6e23fb14a
parent 47608 3c0efa0eeea6
child 47610 f89d3050dcd5
sparse: adjust the temporary includes within a `parentchange` context This is related to dirstate adjustment. Differential Revision: https://phab.mercurial-scm.org/D11033
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- 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(
mercurial