changeset 43798 | 32d11a23c9cf |
parent 43797 | fb07126dadbe |
child 44060 | a61287a95dc3 |
--- a/mercurial/merge.py Thu Dec 05 09:34:43 2019 -0800 +++ b/mercurial/merge.py Thu Dec 05 09:39:49 2019 -0800 @@ -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)