equal
deleted
inserted
replaced
578 conflicts.append(f) |
578 conflicts.append(f) |
579 elif m == 'dg': |
579 elif m == 'dg': |
580 if _checkunknownfile(repo, wctx, mctx, f, args[0]): |
580 if _checkunknownfile(repo, wctx, mctx, f, args[0]): |
581 conflicts.append(f) |
581 conflicts.append(f) |
582 |
582 |
583 for f in sorted(conflicts): |
583 for f in sorted(conflicts): |
584 repo.ui.warn(_("%s: untracked file differs\n") % f) |
584 repo.ui.warn(_("%s: untracked file differs\n") % f) |
585 if conflicts: |
585 if conflicts: |
586 raise error.Abort(_("untracked files in working directory differ " |
586 raise error.Abort(_("untracked files in working directory differ " |
587 "from files in requested revision")) |
587 "from files in requested revision")) |
588 |
588 |
589 for f, (m, args, msg) in actions.iteritems(): |
589 for f, (m, args, msg) in actions.iteritems(): |
590 if m == 'c': |
590 if m == 'c': |
591 actions[f] = ('g', args, msg) |
591 actions[f] = ('g', args, msg) |
592 elif m == 'cm': |
592 elif m == 'cm': |