Patchwork D11033: sparse: adjust the temporary includes within a `parentchange` context

login
register
mail settings
Submitter phabricator
Date July 9, 2021, 11:03 a.m.
Message ID <differential-rev-PHID-DREV-akqfgx2nfcddzaexrld7-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49346/
State Superseded
Headers show

Comments

phabricator - July 9, 2021, 11:03 a.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This is related to dirstate adjustment.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11033

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -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(