Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 44401:9dab3fa64325
copy: add experimental support for marking committed copies
The simplest way I'm aware of to mark a file as copied/moved after
committing is this:
hg uncommit --keep <src> <dest> # <src> needed for move, but not copy
hg mv --after <src> <dest>
hg amend
This patch teaches `hg copy` a `--at-rev` argument to simplify that
into:
hg copy --after --at-rev . <src> <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.
Differential Revision: https://phab.mercurial-scm.org/D8035
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 20 Dec 2019 13:24:46 -0800 |
| parents | 7c4b98a4e536 |
| children | ddbc296a1f48 |
line wrap: on
line diff
--- a/mercurial/commands.py Thu Dec 26 14:02:50 2019 -0800 +++ b/mercurial/commands.py Fri Dec 20 13:24:46 2019 -0800 @@ -2315,7 +2315,7 @@ b'', b'at-rev', b'', - _(b'unmark copies in the given revision (EXPERIMENTAL)'), + _(b'(un)mark copies in the given revision (EXPERIMENTAL)'), _(b'REV'), ), ( @@ -2345,7 +2345,7 @@ all given (positional) arguments are unmarked as copies. The destination file(s) will be left in place (still tracked). - This command takes effect with the next commit. + This command takes effect with the next commit by default. Returns 0 on success, 1 if errors are encountered. """