Show More
@@ -580,11 +580,11 b' def _checkunknownfiles(repo, wctx, mctx,' | |||
|
580 | 580 | if _checkunknownfile(repo, wctx, mctx, f, args[0]): |
|
581 | 581 | conflicts.append(f) |
|
582 | 582 | |
|
583 | for f in sorted(conflicts): | |
|
584 | repo.ui.warn(_("%s: untracked file differs\n") % f) | |
|
585 | if conflicts: | |
|
586 | raise error.Abort(_("untracked files in working directory differ " | |
|
587 | "from files in requested revision")) | |
|
583 | for f in sorted(conflicts): | |
|
584 | repo.ui.warn(_("%s: untracked file differs\n") % f) | |
|
585 | if conflicts: | |
|
586 | raise error.Abort(_("untracked files in working directory differ " | |
|
587 | "from files in requested revision")) | |
|
588 | 588 | |
|
589 | 589 | for f, (m, args, msg) in actions.iteritems(): |
|
590 | 590 | if m == 'c': |
General Comments 0
You need to be logged in to leave comments.
Login now