diff mercurial/commands.py @ 6622:92ee960a928d

merge from crew-stable
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Thu, 22 May 2008 13:29:47 +0200
parents 0697e7818d07 4f3e0dfa24a9
children 0397f592372f
line wrap: on
line diff
--- a/mercurial/commands.py	Mon May 19 10:23:47 2008 +0200
+++ b/mercurial/commands.py	Thu May 22 13:29:47 2008 +0200
@@ -2081,7 +2081,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:
 
@@ -2091,7 +2091,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.