Patchwork D7898: merge: don't call update hook when using in-memory context

login
register
mail settings
Submitter phabricator
Date Jan. 24, 2020, 2:20 p.m.
Message ID <33621993fb12e0b0fb27702ae5d5a382@localhost.localdomain>
Download mbox | patch
Permalink /patch/44606/
State Not Applicable
Headers show

Comments

phabricator - Jan. 24, 2020, 2:20 p.m.
Closed by commit rHGff22c76825b9: merge: don&#039;t call update hook when using in-memory context (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7898?vs=19334&id=19549

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7898/new/

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

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, marmoute, pulkit
Cc: marmoute, pulkit, mercurial-devel

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -2574,7 +2574,7 @@ 
     if not branchmerge:
         sparse.prunetemporaryincludes(repo)
 
-    if not partial:
+    if updatedirstate:
         repo.hook(
             b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount
         )