changeset 6620:4f3e0dfa24a9

improve help text for push (explanation of -r)
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Thu, 22 May 2008 13:26:39 +0200
parents f4c612da788d
children d5cbbe2c49ce
files mercurial/commands.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Mon May 19 10:22:15 2008 +0200
+++ b/mercurial/commands.py	Thu May 22 13:26:39 2008 +0200
@@ -2068,7 +2068,7 @@
 
     By default, push will refuse to run if it detects the result would
     increase the number of remote heads. This generally indicates the
-    the client has forgotten to sync and merge before pushing.
+    the client has forgotten to pull and merge before pushing.
 
     Valid URLs are of the form:
 
@@ -2078,7 +2078,8 @@
       https://[user@]host[:port]/[path]
 
     An optional identifier after # indicates a particular branch, tag,
-    or changeset to push.
+    or changeset to push. If -r is used, the named changeset and all its
+    ancestors will be pushed to the remote repository.
 
     Look at the help text for the pull command for important details
     about ssh:// URLs.