Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 27653:198d291e9ffa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
checkunknownfiles: make control flow clearer In particular, make it clear that we only check for and abort on conflicts if force is not true.
author Siddharth Agarwal <sid0@fb.com>
date Sat, 02 Jan 2016 03:02:57 -0800
parents cc91f3bc5461
children 95dc67f10239
comparison
equal deleted inserted replaced
27652:cc91f3bc5461 27653:198d291e9ffa
578 conflicts.append(f) 578 conflicts.append(f)
579 elif m == 'dg': 579 elif m == 'dg':
580 if _checkunknownfile(repo, wctx, mctx, f, args[0]): 580 if _checkunknownfile(repo, wctx, mctx, f, args[0]):
581 conflicts.append(f) 581 conflicts.append(f)
582 582
583 for f in sorted(conflicts): 583 for f in sorted(conflicts):
584 repo.ui.warn(_("%s: untracked file differs\n") % f) 584 repo.ui.warn(_("%s: untracked file differs\n") % f)
585 if conflicts: 585 if conflicts:
586 raise error.Abort(_("untracked files in working directory differ " 586 raise error.Abort(_("untracked files in working directory differ "
587 "from files in requested revision")) 587 "from files in requested revision"))
588 588
589 for f, (m, args, msg) in actions.iteritems(): 589 for f, (m, args, msg) in actions.iteritems():
590 if m == 'c': 590 if m == 'c':
591 actions[f] = ('g', args, msg) 591 actions[f] = ('g', args, msg)
592 elif m == 'cm': 592 elif m == 'cm':