Show More
@@ -610,17 +610,17 b' def _checkunknownfiles(repo, wctx, mctx,' | |||
|
610 | 610 | choose a different action. |
|
611 | 611 | """ |
|
612 | 612 | conflicts = set() |
|
613 | warnconflicts = set() | |
|
614 | abortconflicts = set() | |
|
615 | unknownconfig = _getcheckunknownconfig(repo, 'merge', 'checkunknown') | |
|
616 | ignoredconfig = _getcheckunknownconfig(repo, 'merge', 'checkignored') | |
|
613 | 617 | if not force: |
|
614 | abortconflicts = set() | |
|
615 | warnconflicts = set() | |
|
616 | 618 | def collectconflicts(conflicts, config): |
|
617 | 619 | if config == 'abort': |
|
618 | 620 | abortconflicts.update(conflicts) |
|
619 | 621 | elif config == 'warn': |
|
620 | 622 | warnconflicts.update(conflicts) |
|
621 | 623 | |
|
622 | unknownconfig = _getcheckunknownconfig(repo, 'merge', 'checkunknown') | |
|
623 | ignoredconfig = _getcheckunknownconfig(repo, 'merge', 'checkignored') | |
|
624 | 624 | for f, (m, args, msg) in actions.iteritems(): |
|
625 | 625 | if m in ('c', 'dc'): |
|
626 | 626 | if _checkunknownfile(repo, wctx, mctx, f): |
@@ -634,14 +634,15 b' def _checkunknownfiles(repo, wctx, mctx,' | |||
|
634 | 634 | unknownconflicts = conflicts - ignoredconflicts |
|
635 | 635 | collectconflicts(ignoredconflicts, ignoredconfig) |
|
636 | 636 | collectconflicts(unknownconflicts, unknownconfig) |
|
637 | for f in sorted(abortconflicts): | |
|
638 | repo.ui.warn(_("%s: untracked file differs\n") % f) | |
|
639 | if abortconflicts: | |
|
640 | raise error.Abort(_("untracked files in working directory " | |
|
641 | "differ from files in requested revision")) | |
|
642 | 637 | |
|
643 |
|
|
|
644 |
|
|
|
638 | for f in sorted(abortconflicts): | |
|
639 | repo.ui.warn(_("%s: untracked file differs\n") % f) | |
|
640 | if abortconflicts: | |
|
641 | raise error.Abort(_("untracked files in working directory " | |
|
642 | "differ from files in requested revision")) | |
|
643 | ||
|
644 | for f in sorted(warnconflicts): | |
|
645 | repo.ui.warn(_("%s: replacing untracked file\n") % f) | |
|
645 | 646 | |
|
646 | 647 | for f, (m, args, msg) in actions.iteritems(): |
|
647 | 648 | backup = f in conflicts |
General Comments 0
You need to be logged in to leave comments.
Login now