Mercurial > hg
changeset 8277:b9403042968a
write options in "-r/--rev" style in help texts
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sat, 02 May 2009 19:13:29 +0200 |
| parents | dd50067c2329 |
| children | 1f9787de17d9 |
| files | hgext/children.py mercurial/commands.py |
| diffstat | 2 files changed, 13 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/children.py Sat May 02 17:48:01 2009 +0200 +++ b/hgext/children.py Sat May 02 19:13:29 2009 +0200 @@ -17,7 +17,7 @@ """show the children of the given or working directory revision Print the children of the working directory's revisions. If a - revision is given via --rev/-r, the children of that revision will + revision is given via -r/--rev, the children of that revision will be printed. If a file argument is given, revision in which the file was last changed (after the working directory revision or the argument to --rev if given) is printed.
--- a/mercurial/commands.py Sat May 02 17:48:01 2009 +0200 +++ b/mercurial/commands.py Sat May 02 19:13:29 2009 +0200 @@ -2667,7 +2667,8 @@ Start a local HTTP repository browser and pull server. By default, the server logs accesses to stdout and errors to - stderr. Use the -A and -E options to log to files. + stderr. Use the -A/--accesslog and -E/--errorlog options to log to + files. """ if opts["stdio"]: @@ -2939,16 +2940,16 @@ the working directory will additionally be switched to that branch. - When there are uncommitted changes, use option -C to discard them, - forcibly replacing the state of the working directory with the - requested revision. - - When there are uncommitted changes and option -C is not used, and - the parent revision and requested revision are on the same branch, - and one of them is an ancestor of the other, then the new working - directory will contain the requested revision merged with the - uncommitted changes. Otherwise, the update will fail with a - suggestion to use 'merge' or 'update -C' instead. + When there are uncommitted changes, use option -C/--clean to + discard them, forcibly replacing the state of the working + directory with the requested revision. + + When there are uncommitted changes and option -C/--clean is not + used, and the parent revision and requested revision are on the + same branch, and one of them is an ancestor of the other, then the + new working directory will contain the requested revision merged + with the uncommitted changes. Otherwise, the update will fail with + a suggestion to use 'merge' or 'update -C' instead. If you want to update just one file to an older revision, use revert.