Wrong option "--branch" for the incoming command

[Matt Mackall]

[You forgot to cc: the list: http://mercurial.selenic.com/wiki/mpm]

On Mon, 2010-08-02 at 13:35 +0200, Alexander Dobriakov wrote:
> Hi Mike,

Mike?

> in the Mercurial documentation
> http://www.selenic.com/mercurial/hg.1.html
> 
> you write:
> 
> 
> incoming [-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]
>         
>         Show new changesets found in the specified path/URL or the
>         default pull location. These are the changesets that would
>         have been pulled if a pull at the time you issued this
>         command.
>         
>         For remote repository, using --bundle avoids downloading the
>         changesets twice if the incoming is followed by a pull.
>         
>         See pull for valid source format details.
>         
>         Returns 0 if there are incoming changes, 1 otherwise.
>         
>         options:
>         
>         -f, --force
>         run even if remote repository
>         is unrelated
>         -n, --newest-first
>          
>         show newest record first
>         --bundle
>         file to store the bundles into
>         -r, --rev
>         a remote changeset intended to
>         be added
>         -b, --branch
>         a specific branch you would
>         like to pull
>         -p, --patch
>         show patch
>         -g, --git
>         use git extended diff format
>         -l, --limit
>         limit number of changes
>         displayed
>         -M, --no-merges
>          
>         do not show merges
>         --stat
>         output diffstat-style summary
>         of changes
>         --style
>         display using template map file
>         --template
>         display with template
>         -e, --ssh
>         specify ssh command to use
>         --remotecmd
>         specify hg command to run on
>         the remote side
> 
> But there is no -b/--branch option for the incoming command in
> Mercurial 1.6. I propose to remove this line from documentation:
> -b, --branch a specific branch you would like to pull

Really? 

$ hg16 help in | grep branch
 -b --branch BRANCH [+]  a specific branch you would like to pull
$ hg15 help in | grep branch
 -b --branch        a specific branch you would like to pull
$ hg14 help in | grep branch

I suspect you're not running the version of hg you think you are. Which
leads me to suspect you're using a Mac, where no one can agree where
things should be installed and people constantly install two copies from
different source.

-- 
Mathematics is the supreme nostalgia of our time.