Show More
@@ -570,15 +570,15 b' def _checkunknownfiles(repo, wctx, mctx,' | |||
|
570 | 570 | files. For some actions, the result is to abort; for others, it is to |
|
571 | 571 | choose a different action. |
|
572 | 572 | """ |
|
573 |
conflicts = |
|
|
573 | conflicts = set() | |
|
574 | 574 | if not force: |
|
575 | 575 | for f, (m, args, msg) in actions.iteritems(): |
|
576 | 576 | if m in ('c', 'dc'): |
|
577 | 577 | if _checkunknownfile(repo, wctx, mctx, f): |
|
578 |
conflicts.a |
|
|
578 | conflicts.add(f) | |
|
579 | 579 | elif m == 'dg': |
|
580 | 580 | if _checkunknownfile(repo, wctx, mctx, f, args[0]): |
|
581 |
conflicts.a |
|
|
581 | conflicts.add(f) | |
|
582 | 582 | |
|
583 | 583 | for f in sorted(conflicts): |
|
584 | 584 | repo.ui.warn(_("%s: untracked file differs\n") % f) |
General Comments 0
You need to be logged in to leave comments.
Login now