equal
deleted
inserted
replaced
348 files.append(ff) |
348 files.append(ff) |
349 del fdict[ff] |
349 del fdict[ff] |
350 break |
350 break |
351 if not f in files and match(f) and _iskwfile(ui, man, f): |
351 if not f in files and match(f) and _iskwfile(ui, man, f): |
352 files.append(f) |
352 files.append(f) |
353 ffiles = fdict.keys() |
353 if fdict: |
354 ffiles.sort() |
354 ffiles = fdict.keys() |
355 for f in ffiles: |
355 ffiles.sort() |
356 ui.warn(_('%s: No such file\n') % f) |
356 cwd = repo.getcwd() |
|
357 for f in ffiles: |
|
358 ui.warn(_('%s: No such file in working copy\n') |
|
359 % _pathto(repo, cwd, f)) |
357 # 7th argument sets commit to False |
360 # 7th argument sets commit to False |
358 _overwrite(ui, repo, files, ctx.node(), man, expand, False) |
361 _overwrite(ui, repo, files, ctx.node(), man, expand, False) |
359 finally: |
362 finally: |
360 del wlock, lock |
363 del wlock, lock |
361 |
364 |