Show More
@@ -583,6 +583,14 b' def _checkunknownfiles(repo, wctx, mctx,' | |||
|
583 | 583 | """ |
|
584 | 584 | conflicts = set() |
|
585 | 585 | if not force: |
|
586 | abortconflicts = set() | |
|
587 | warnconflicts = set() | |
|
588 | def collectconflicts(conflicts, config): | |
|
589 | if config == 'abort': | |
|
590 | abortconflicts.update(conflicts) | |
|
591 | elif config == 'warn': | |
|
592 | warnconflicts.update(conflicts) | |
|
593 | ||
|
586 | 594 | config = _getcheckunknownconfig(repo, 'merge', 'checkunknown') |
|
587 | 595 | for f, (m, args, msg) in actions.iteritems(): |
|
588 | 596 | if m in ('c', 'dc'): |
@@ -592,15 +600,15 b' def _checkunknownfiles(repo, wctx, mctx,' | |||
|
592 | 600 | if _checkunknownfile(repo, wctx, mctx, f, args[0]): |
|
593 | 601 | conflicts.add(f) |
|
594 | 602 | |
|
595 | if config == 'abort': | |
|
596 |
|
|
|
597 |
|
|
|
598 |
|
|
|
599 |
|
|
|
600 |
|
|
|
601 | elif config == 'warn': | |
|
602 |
|
|
|
603 |
|
|
|
603 | collectconflicts(conflicts, config) | |
|
604 | for f in sorted(abortconflicts): | |
|
605 | repo.ui.warn(_("%s: untracked file differs\n") % f) | |
|
606 | if abortconflicts: | |
|
607 | raise error.Abort(_("untracked files in working directory " | |
|
608 | "differ from files in requested revision")) | |
|
609 | ||
|
610 | for f in sorted(warnconflicts): | |
|
611 | repo.ui.warn(_("%s: replacing untracked file\n") % f) | |
|
604 | 612 | |
|
605 | 613 | for f, (m, args, msg) in actions.iteritems(): |
|
606 | 614 | backup = f in conflicts |
General Comments 0
You need to be logged in to leave comments.
Login now