Submitter | phabricator |
---|---|
Date | July 25, 2020, 10:01 a.m. |
Message ID | <differential-rev-PHID-DREV-ayaib537iubsuenudirl-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/46898/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -1133,9 +1133,9 @@ prunedactions = sparse.filterupdatesactions( repo, wctx, mctx, branchmerge, mresult.actions ) + mresult.setactions(prunedactions) _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult) - mresult.setactions(prunedactions) return mresult