341 elif not force and different: |
341 elif not force and different: |
342 aborts.append((f, "ud")) |
342 aborts.append((f, "ud")) |
343 else: |
343 else: |
344 actions.append((f, "g", (fl2,), "remote created")) |
344 actions.append((f, "g", (fl2,), "remote created")) |
345 elif n2 and n2 != ma[f]: |
345 elif n2 and n2 != ma[f]: |
346 prompts.append((f, "dc")) # prompt deleted/changed |
346 different = _checkunknownfile(repo, wctx, p2, f) |
|
347 if not force and different: |
|
348 aborts.append((f, "ud")) |
|
349 else: |
|
350 # if different: old untracked f may be overwritten and lost |
|
351 prompts.append((f, "dc")) # prompt deleted/changed |
347 |
352 |
348 for f, m in sorted(aborts): |
353 for f, m in sorted(aborts): |
349 if m == "ud": |
354 if m == "ud": |
350 repo.ui.warn(_("%s: untracked file differs\n") % f) |
355 repo.ui.warn(_("%s: untracked file differs\n") % f) |
351 else: assert False, m |
356 else: assert False, m |