merge from crew-stable

hgext/mq.py

@@ -1744,11 +1744,11 @@ def refresh(ui, repo, *pats, **opts):
 
 def diff(ui, repo, *pats, **opts):
     """diff of the current patch and subsequent modifications
-    
+
     Shows a diff which includes the current patch as well as any changes which
     have been made in the working directory since the last refresh (thus
     showing what the current patch would become after a qrefresh).
-    
+
     Use 'hg diff' if you only want to see the changes made since the last
     qrefresh, or 'hg export qtip' if you want to see changes made by the
     current patch without including changes made since the qrefresh.
@@ -1942,7 +1942,7 @@ def push(ui, repo, patch=None, **opts):
 
 def pop(ui, repo, patch=None, **opts):
     """pop the current patch off the stack
-    
+
     By default, pops off the top of the patch stack. If given a patch name,
     keeps popping off patches until the named patch is at the top of the stack.
     """

mercurial/commands.py

@@ -2081,7 +2081,7 @@ def push(ui, repo, dest=None, **opts):
 
     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 @@ def push(ui, repo, dest=None, **opts):
       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.