Submitter | phabricator |
---|---|
Date | Dec. 6, 2019, 3:37 p.m. |
Message ID | <e73e060b28076101358a72f273a42207@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/43598/ |
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 @@ -2626,6 +2626,9 @@ if keepparent and len(parents) == 2 and base in parents: parents.remove(base) pother = parents[0].node() + # Never set both parents equal to each other + if pother == pctx.node(): + pother = nullid with repo.dirstate.parentchange(): repo.setparents(pctx.node(), pother)