equal
deleted
inserted
replaced
222 $ hg st -AC foo |
222 $ hg st -AC foo |
223 C foo |
223 C foo |
224 Trying to copy on top of an existing file fails, |
224 Trying to copy on top of an existing file fails, |
225 $ hg copy -A bar foo |
225 $ hg copy -A bar foo |
226 foo: not overwriting - file already committed |
226 foo: not overwriting - file already committed |
227 (hg copy --after --force to replace the file by recording a copy) |
227 ('hg copy --after --force' to replace the file by recording a copy) |
228 same error without the --after, so the user doesn't have to go through |
228 same error without the --after, so the user doesn't have to go through |
229 two hints: |
229 two hints: |
230 $ hg copy bar foo |
230 $ hg copy bar foo |
231 foo: not overwriting - file already committed |
231 foo: not overwriting - file already committed |
232 (hg copy --force to replace the file by recording a copy) |
232 ('hg copy --force' to replace the file by recording a copy) |
233 but it's considered modified after a copy --after --force |
233 but it's considered modified after a copy --after --force |
234 $ hg copy -Af bar foo |
234 $ hg copy -Af bar foo |
235 $ hg st -AC foo |
235 $ hg st -AC foo |
236 M foo |
236 M foo |
237 bar |
237 bar |
238 The hint for a file that exists but is not in file history doesn't |
238 The hint for a file that exists but is not in file history doesn't |
239 mention --force: |
239 mention --force: |
240 $ touch xyzzy |
240 $ touch xyzzy |
241 $ hg cp bar xyzzy |
241 $ hg cp bar xyzzy |
242 xyzzy: not overwriting - file exists |
242 xyzzy: not overwriting - file exists |
243 (hg copy --after to record the copy) |
243 ('hg copy --after' to record the copy) |
244 |
244 |
245 $ cd .. |
245 $ cd .. |