Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 23649:18ab5e5955df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: structure 'remote created' code to match table This does duplicate the call to _checkunknownfile(), but it will simplify future patches.
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 19 Nov 2014 11:44:00 -0800
parents a7a0f32a383f
children b85c548ab14d
comparison
equal deleted inserted replaced
23648:915ac9403e13 23649:18ab5e5955df
494 # y y n | get 494 # y y n | get
495 # y y y | merge 495 # y y y | merge
496 # 496 #
497 # Checking whether the files are different is expensive, so we 497 # Checking whether the files are different is expensive, so we
498 # don't do that when we can avoid it. 498 # don't do that when we can avoid it.
499 if force and not branchmerge: 499 if not force:
500 different = _checkunknownfile(repo, wctx, p2, f)
501 if different:
502 aborts.append((f, "ud"))
503 else:
504 actions[f] = ('g', (fl2,), "remote created")
505 elif not branchmerge:
500 actions[f] = ('g', (fl2,), "remote created") 506 actions[f] = ('g', (fl2,), "remote created")
501 else: 507 else:
502 different = _checkunknownfile(repo, wctx, p2, f) 508 different = _checkunknownfile(repo, wctx, p2, f)
503 if force and branchmerge and different: 509 if different:
504 actions[f] = ('m', (f, f, None, False, pa.node()), 510 actions[f] = ('m', (f, f, None, False, pa.node()),
505 "remote differs from untracked local") 511 "remote differs from untracked local")
506 elif not force and different:
507 aborts.append((f, 'ud'))
508 else: 512 else:
509 actions[f] = ('g', (fl2,), "remote created") 513 actions[f] = ('g', (fl2,), "remote created")
510 elif n2 != ma[f]: 514 elif n2 != ma[f]:
511 different = _checkunknownfile(repo, wctx, p2, f) 515 different = _checkunknownfile(repo, wctx, p2, f)
512 if not force and different: 516 if not force and different: