Submitter | Anton Shestakov |
---|---|
Date | Sept. 18, 2019, 12:01 p.m. |
Message ID | <085295f828459f8ce90f.1568808117@df1> |
Download | mbox | patch |
Permalink | /patch/41714/ |
State | Accepted |
Headers | show |
Comments
On Wed, 18 Sep 2019 19:01:57 +0700, Anton Shestakov wrote: > # HG changeset patch > # User Anton Shestakov <av6@dwimlabs.net> > # Date 1568803990 -25200 > # Wed Sep 18 17:53:10 2019 +0700 > # Branch stable > # Node ID 085295f828459f8ce90f6f5889bac3e0405945a8 > # Parent e26c2440a030b2c5fc43de1a2feedee37d437557 > merge: respect parents order when using `graft` on a merge, this time for real Queued for stable, thanks.
Patch
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -2256,7 +2256,7 @@ def graft(repo, ctx, pctx, labels=None, pother = nullid parents = ctx.parents() if keepparent and len(parents) == 2 and pctx in parents: - if pctx == parents[0]: + if pctx == parents[1]: potherp1 = True parents.remove(pctx) pother = parents[0].node()