Mercurial > hg
changeset 46088:8837498ae6e0
docs: prefer `hg diff --from/--to` over `-r`
This patch includes updating away from the broken `hg diff -r
'date(...)'` (see not in previous patch).
Differential Revision: https://phab.mercurial-scm.org/D9555
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 09 Dec 2020 18:51:52 -0800 |
| parents | 64292addbe67 |
| children | 8ff2d8359d0f |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Dec 09 18:31:19 2020 -0800 +++ b/mercurial/commands.py Wed Dec 09 18:51:52 2020 -0800 @@ -2509,11 +2509,11 @@ - compare two historical versions of a directory, with rename info:: - hg diff --git -r 1.0:1.2 lib/ + hg diff --git --from 1.0 --to 1.2 lib/ - get change stats relative to the last change on some date:: - hg diff --stat -r "date('may 2')" + hg diff --stat --from "date('may 2')" - diff all newly-added files that contain a keyword:: @@ -2521,9 +2521,9 @@ - compare a revision and its parents:: - hg diff -c 9353 # compare against first parent - hg diff -r 9353^:9353 # same using revset syntax - hg diff -r 9353^2:9353 # compare against the second parent + hg diff -c 9353 # compare against first parent + hg diff --from 9353^ --to 9353 # same using revset syntax + hg diff --from 9353^2 --to 9353 # compare against the second parent Returns 0 on success. """ @@ -2964,7 +2964,7 @@ is thus pretty much the same as:: - hg diff -r 234 -r 345 | hg import + hg diff --from 234 --to 345 | hg import but using merge to resolve conflicts and track moved files.