equal
deleted
inserted
replaced
264 move everything under directory d1 to existing directory d2, do not |
264 move everything under directory d1 to existing directory d2, do not |
265 overwrite existing files (d2/b) |
265 overwrite existing files (d2/b) |
266 |
266 |
267 $ hg rename d1/* d2 |
267 $ hg rename d1/* d2 |
268 d2/b: not overwriting - file already committed |
268 d2/b: not overwriting - file already committed |
269 (hg rename --force to replace the file by recording a rename) |
269 ('hg rename --force' to replace the file by recording a rename) |
270 moving d1/d11/a1 to d2/d11/a1 |
270 moving d1/d11/a1 to d2/d11/a1 |
271 $ hg status -C |
271 $ hg status -C |
272 A d2/a |
272 A d2/a |
273 d1/a |
273 d1/a |
274 A d2/ba |
274 A d2/ba |
369 attempt to overwrite an existing file |
369 attempt to overwrite an existing file |
370 |
370 |
371 $ echo "ca" > d1/ca |
371 $ echo "ca" > d1/ca |
372 $ hg rename d1/ba d1/ca |
372 $ hg rename d1/ba d1/ca |
373 d1/ca: not overwriting - file exists |
373 d1/ca: not overwriting - file exists |
374 (hg rename --after to record the rename) |
374 ('hg rename --after' to record the rename) |
375 $ hg status -C |
375 $ hg status -C |
376 ? d1/ca |
376 ? d1/ca |
377 $ hg update -C |
377 $ hg update -C |
378 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
378 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
379 |
379 |
393 |
393 |
394 #if symlink |
394 #if symlink |
395 $ ln -s ba d1/ca |
395 $ ln -s ba d1/ca |
396 $ hg rename --traceback d1/ba d1/ca |
396 $ hg rename --traceback d1/ba d1/ca |
397 d1/ca: not overwriting - file exists |
397 d1/ca: not overwriting - file exists |
398 (hg rename --after to record the rename) |
398 ('hg rename --after' to record the rename) |
399 $ hg status -C |
399 $ hg status -C |
400 ? d1/ca |
400 ? d1/ca |
401 $ hg update -C |
401 $ hg update -C |
402 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
402 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
403 $ rm d1/ca |
403 $ rm d1/ca |