diff options
| author | gmilos@localhost.localdomain <gmilos@localhost.localdomain> | 2005-07-04 14:47:28 +0000 |
|---|---|---|
| committer | gmilos@localhost.localdomain <gmilos@localhost.localdomain> | 2005-07-04 14:47:28 +0000 |
| commit | b9db0e99ab5b4f533ec288082d07825907aae7b0 (patch) | |
| tree | c5d2d15c18416106467ab838f9c24a86b5aef461 /docs/misc | |
| parent | d83ba385f0b5412b02177592954eed3f85a256ed (diff) | |
| download | xen-b9db0e99ab5b4f533ec288082d07825907aae7b0.tar.gz xen-b9db0e99ab5b4f533ec288082d07825907aae7b0.tar.bz2 xen-b9db0e99ab5b4f533ec288082d07825907aae7b0.zip | |
Extended explanation of 'hg diff'.
Diffstat (limited to 'docs/misc')
| -rw-r--r-- | docs/misc/hg-cheatsheet.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/docs/misc/hg-cheatsheet.txt b/docs/misc/hg-cheatsheet.txt index a9e84efc9a..9f901f086f 100644 --- a/docs/misc/hg-cheatsheet.txt +++ b/docs/misc/hg-cheatsheet.txt @@ -3,7 +3,7 @@ Mercurial(hg) Cheatsheet for Xen ================================ Written by Andrew Warfield, extended by Michael Fetterman and Ian Pratt -June 29, 2005 +June 29, 2005, extended by Grzegorz Milos 04 July 2005. Overview -------- @@ -121,7 +121,7 @@ without any merging of any kind. "hg pull -u" implies merging with the current state of your working directory. If you weren't already "updated" to your local repository's tip, you might be surprised to find yourself merging the results of the pull with a non-tip node in -your local repository. +your local repository. Revision History @@ -258,6 +258,11 @@ Generating a patch is easy, will generate a patch describing the diff between that changeset and its parent. + +To generate a patch between two specified revisions use: + hg diff -r A -r B [files] +NB: BK syntax -rA..B isn't supported by Hg. + Pushing changesets to a parent repository ----------------------------------------- @@ -384,7 +389,7 @@ Additional useful commands Shows the differences between whatever changeset you most recently checked out, and your current working directory: - hg diff + hg diff View an annotated version of a source file: |