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