comparison mercurial/commands.py @ 44399:7c4b98a4e536

copy: add experimetal support for unmarking committed copies The simplest way I'm aware of to unmark a file as copied after committing is this: hg uncommit --keep <dest> hg forget <dest> hg add <dest> hg amend This patch teaches `hg copy --forget` a `-r` argument to simplify that into: hg copy --forget --at-rev . <dest> In addition to being simpler, it doesn't touch the working copy, so it can easily be used even if the destination file has been modified in the working copy. I'll teach `hg copy` without `--forget` to work with `--at-rev` next. Differential Revision: https://phab.mercurial-scm.org/D8030
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 28 Jan 2020 14:07:57 -0800
parents 8be0c63535b5
children 9dab3fa64325
comparison
equal deleted inserted replaced
44398:8be0c63535b5 44399:7c4b98a4e536
2310 b'copy|cp', 2310 b'copy|cp',
2311 [ 2311 [
2312 (b'', b'forget', None, _(b'unmark a file as copied')), 2312 (b'', b'forget', None, _(b'unmark a file as copied')),
2313 (b'A', b'after', None, _(b'record a copy that has already occurred')), 2313 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2314 ( 2314 (
2315 b'',
2316 b'at-rev',
2317 b'',
2318 _(b'unmark copies in the given revision (EXPERIMENTAL)'),
2319 _(b'REV'),
2320 ),
2321 (
2315 b'f', 2322 b'f',
2316 b'force', 2323 b'force',
2317 None, 2324 None,
2318 _(b'forcibly copy over an existing managed file'), 2325 _(b'forcibly copy over an existing managed file'),
2319 ), 2326 ),