# HG changeset patch # User Dirkjan Ochtman # Date 1211455787 -7200 # Node ID 92ee960a928dbecd0daaea1b4cc73d24f754a04c # Parent 170818dad56b671a4782794fb5da02635cfe6681# Parent d5cbbe2c49cee22a9fbeb9ea41daa0ac4e26b846 merge from crew-stable diff -r 170818dad56b -r 92ee960a928d hgext/mq.py --- a/hgext/mq.py Mon May 19 10:23:47 2008 +0200 +++ b/hgext/mq.py Thu May 22 13:29:47 2008 +0200 @@ -1744,11 +1744,11 @@ 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 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. """ diff -r 170818dad56b -r 92ee960a928d mercurial/commands.py --- 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.