Mercurial > hg
comparison tests/test-completion.t @ 44365: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 | acbfa31cfaf2 |
comparison
equal
deleted
inserted
replaced
44364:8be0c63535b5 | 44365:7c4b98a4e536 |
---|---|
255 cat: output, rev, decode, include, exclude, template | 255 cat: output, rev, decode, include, exclude, template |
256 clone: noupdate, updaterev, rev, branch, pull, uncompressed, stream, ssh, remotecmd, insecure | 256 clone: noupdate, updaterev, rev, branch, pull, uncompressed, stream, ssh, remotecmd, insecure |
257 commit: addremove, close-branch, amend, secret, edit, force-close-branch, interactive, include, exclude, message, logfile, date, user, subrepos | 257 commit: addremove, close-branch, amend, secret, edit, force-close-branch, interactive, include, exclude, message, logfile, date, user, subrepos |
258 config: untrusted, edit, local, global, template | 258 config: untrusted, edit, local, global, template |
259 continue: dry-run | 259 continue: dry-run |
260 copy: forget, after, force, include, exclude, dry-run | 260 copy: forget, after, at-rev, force, include, exclude, dry-run |
261 debugancestor: | 261 debugancestor: |
262 debugapplystreamclonebundle: | 262 debugapplystreamclonebundle: |
263 debugbuilddag: mergeable-file, overwritten-file, new-file | 263 debugbuilddag: mergeable-file, overwritten-file, new-file |
264 debugbundle: all, part-type, spec | 264 debugbundle: all, part-type, spec |
265 debugcapabilities: | 265 debugcapabilities: |