Mercurial > hg-stable

changeset 10376:a2950e053614

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: Improved body text
author timeless <timeless@mozdev.org>
date Sun, 07 Feb 2010 15:08:26 +0100
parents adf9505e8888
children 04e1e6743809
files mercurial/commands.py tests/test-globalopts.out tests/test-help.out
diffstat 3 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Nov 20 14:37:36 2009 +0200
+++ b/mercurial/commands.py	Sun Feb 07 15:08:26 2010 +0100
@@ -486,8 +486,8 @@
     Generate a compressed changegroup file collecting changesets not
     known to be in another repository.
 
-    If no destination repository is specified the destination is
-    assumed to have all the nodes specified by one or more --base
+    If you omit the destination repository, then hg assumes the
+    destination will have all the nodes you specify with --base
     parameters. To create a bundle containing all changesets, use
     -a/--all (or --base null).
 
@@ -2200,13 +2200,13 @@
     return hg.merge(repo, node, force=opts.get('force'))
 
 def outgoing(ui, repo, dest=None, **opts):
-    """show changesets not found in destination
+    """show changesets not found in the destination
 
     Show changesets not found in the specified destination repository
     or the default push location. These are the changesets that would
     be pushed if a push was requested.
 
-    See pull for valid destination format details.
+    See pull for details of valid destination formats.
     """
     limit = cmdutil.loglimit(opts)
     dest = ui.expandpath(dest or 'default-push', dest or 'default')
@@ -2350,7 +2350,7 @@
 def push(ui, repo, dest=None, **opts):
     """push changes to the specified destination
 
-    Push changes from the local repository to the given destination.
+    Push changes from the local repository to the specified destination.
 
     This is the symmetrical operation for pull. It moves changes from
     the current repository to a different one. If the destination is
@@ -2550,8 +2550,8 @@
     to the contents they had in the parent of the working directory.
     This restores the contents of the affected files to an unmodified
     state and unschedules adds, removes, copies, and renames. If the
-    working directory has two parents, you must explicitly specify the
-    revision to revert to.
+    working directory has two parents, you must explicitly specify a
+    revision.
 
     Using the -r/--rev option, revert the given files or directories
     to their contents as of a specific revision. This can be helpful
@@ -2775,7 +2775,7 @@
     - commit
     - import
     - pull
-    - push (with this repository as destination)
+    - push (with this repository as the destination)
     - unbundle
 
     This command is not intended for use on public repositories. Once
--- a/tests/test-globalopts.out	Fri Nov 20 14:37:36 2009 +0200
+++ b/tests/test-globalopts.out	Sun Feb 07 15:08:26 2010 +0100
@@ -176,7 +176,7 @@
  log          show revision history of entire repository or files
  manifest     output the current or given revision of the project manifest
  merge        merge working directory with another revision
- outgoing     show changesets not found in destination
+ outgoing     show changesets not found in the destination
  parents      show the parents of the working directory or revision
  paths        show aliases for remote repositories
  pull         pull changes from the specified source
@@ -245,7 +245,7 @@
  log          show revision history of entire repository or files
  manifest     output the current or given revision of the project manifest
  merge        merge working directory with another revision
- outgoing     show changesets not found in destination
+ outgoing     show changesets not found in the destination
  parents      show the parents of the working directory or revision
  paths        show aliases for remote repositories
  pull         pull changes from the specified source
--- a/tests/test-help.out	Fri Nov 20 14:37:36 2009 +0200
+++ b/tests/test-help.out	Sun Feb 07 15:08:26 2010 +0100
@@ -69,7 +69,7 @@
  log          show revision history of entire repository or files
  manifest     output the current or given revision of the project manifest
  merge        merge working directory with another revision
- outgoing     show changesets not found in destination
+ outgoing     show changesets not found in the destination
  parents      show the parents of the working directory or revision
  paths        show aliases for remote repositories
  pull         pull changes from the specified source
@@ -134,7 +134,7 @@
  log          show revision history of entire repository or files
  manifest     output the current or given revision of the project manifest
  merge        merge working directory with another revision
- outgoing     show changesets not found in destination
+ outgoing     show changesets not found in the destination
  parents      show the parents of the working directory or revision
  paths        show aliases for remote repositories
  pull         pull changes from the specified source
@@ -500,7 +500,7 @@
  log          show revision history of entire repository or files
  manifest     output the current or given revision of the project manifest
  merge        merge working directory with another revision
- outgoing     show changesets not found in destination
+ outgoing     show changesets not found in the destination
  parents      show the parents of the working directory or revision
  paths        show aliases for remote repositories
  pull         pull changes from the specified source