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
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 )