Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 23320:296b09dcef63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
manifestmerge: use already existing fl2 synonym for m2.flags(f) Probably not a noticeable performance gain, but shortens the code slightly.
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 14 Nov 2014 09:33:28 -0800
parents 3177d710630d
children 1cbc00ff2373
comparison
equal deleted inserted replaced
23319:3177d710630d 23320:296b09dcef63
512 if not force and different: 512 if not force and different:
513 aborts.append((f, "ud")) 513 aborts.append((f, "ud"))
514 else: 514 else:
515 # if different: old untracked f may be overwritten and lost 515 # if different: old untracked f may be overwritten and lost
516 if acceptremote: 516 if acceptremote:
517 actions['g'].append((f, (m2.flags(f),), 517 actions['g'].append((f, (fl2,), "remote recreating"))
518 "remote recreating"))
519 else: 518 else:
520 actions['dc'].append((f, (m2.flags(f),), 519 actions['dc'].append((f, (fl2,), "prompt deleted/changed"))
521 "prompt deleted/changed"))
522 520
523 for f, m in sorted(aborts): 521 for f, m in sorted(aborts):
524 if m == "ud": 522 if m == "ud":
525 repo.ui.warn(_("%s: untracked file differs\n") % f) 523 repo.ui.warn(_("%s: untracked file differs\n") % f)
526 else: assert False, m 524 else: assert False, m