# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1625774912 -7200
# Node ID c8d6e23fb14abbb8bd9fac2e9c8edd1403ceee17
# Parent  3c0efa0eeea67b57e8394c92a8cff19db1dbf73d
sparse: adjust the temporary includes within a `parentchange` context

This is related to dirstate adjustment.

Differential Revision: https://phab.mercurial-scm.org/D11033

diff -r 3c0efa0eeea6 -r c8d6e23fb14a mercurial/merge.py
--- 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(