equal
deleted
inserted
replaced
514 aborts = [] |
514 aborts = [] |
515 if not force: |
515 if not force: |
516 for f, (m, args, msg) in actions.iteritems(): |
516 for f, (m, args, msg) in actions.iteritems(): |
517 if m in ('c', 'dc'): |
517 if m in ('c', 'dc'): |
518 if _checkunknownfile(repo, wctx, p2, f): |
518 if _checkunknownfile(repo, wctx, p2, f): |
519 aborts.append((f, "ud")) |
519 aborts.append(f) |
520 |
520 |
521 for f, m in sorted(aborts): |
521 for f in sorted(aborts): |
522 if m == 'ud': |
522 repo.ui.warn(_("%s: untracked file differs\n") % f) |
523 repo.ui.warn(_("%s: untracked file differs\n") % f) |
|
524 else: assert False, m |
|
525 if aborts: |
523 if aborts: |
526 raise util.Abort(_("untracked files in working directory differ " |
524 raise util.Abort(_("untracked files in working directory differ " |
527 "from files in requested revision")) |
525 "from files in requested revision")) |
528 |
526 |
529 for f, (m, args, msg) in actions.iteritems(): |
527 for f, (m, args, msg) in actions.iteritems(): |