Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 42957:2c14bf83b58b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Yuya Nishihara <yuya@tcha.org>
date Thu, 19 Sep 2019 07:50:24 +0900
parents f059d6ffcdf0 085295f82845
children af2b5562fcaf
comparison
equal deleted inserted replaced
42956:44be33cf7a57 42957:2c14bf83b58b
2255 pother = ctx.node() 2255 pother = ctx.node()
2256 else: 2256 else:
2257 pother = nullid 2257 pother = nullid
2258 parents = ctx.parents() 2258 parents = ctx.parents()
2259 if keepparent and len(parents) == 2 and pctx in parents: 2259 if keepparent and len(parents) == 2 and pctx in parents:
2260 if pctx == parents[0]: 2260 if pctx == parents[1]:
2261 potherp1 = True 2261 potherp1 = True
2262 parents.remove(pctx) 2262 parents.remove(pctx)
2263 pother = parents[0].node() 2263 pother = parents[0].node()
2264 2264
2265 with repo.dirstate.parentchange(): 2265 with repo.dirstate.parentchange():