Merge with stable f1c2de22b8a8 by mg

[Adrian Buehlmann]

On 13.08.2010 01:16, Mercurial Commits wrote:
> 59 new changesets (9 stable) in mercurial:
> 
[snip]
> 
> http://selenic.com/repo/hg//rev/f1c2de22b8a8
> changeset:   11823:f1c2de22b8a8
> parent:      11822:0cae834cdc80
> parent:      11818:b1ae33b813cb
> user:        Martin Geisler <mg at aragost.com>
> date:        Thu Aug 12 18:30:24 2010 +0200
> summary:     Merge with stable

I think there's a problem with this merge:

> # HG changeset patch
> # User Martin Geisler <mg at aragost.com>
> # Date 1281630624 -7200
> # Node ID f1c2de22b8a88baf36c69b852f8a3b35ca6b6c91
> # Parent  0cae834cdc8001b43010dab6e74eb54a8aa8d865# Parent  b1ae33b813cb5c0f7a7b95de112b21182f972a4d
> Merge with stable
> 
> diff -r 0cae834cdc80 -r f1c2de22b8a8 mercurial/hg.py
> --- a/mercurial/hg.py	Thu Aug 12 18:30:06 2010 +0200
> +++ b/mercurial/hg.py	Thu Aug 12 18:30:24 2010 +0200
> @@ -221,7 +221,7 @@
>          src_repo = repository(ui, source)
>      else:
>          src_repo = source
> -        branch = (None, [])
> +        branch = (None, branch or [])
>          origsource = source = src_repo.url()
>      rev, checkout = addbranchrevs(src_repo, src_repo, branch, rev)
>  
> diff -r 0cae834cdc80 -r f1c2de22b8a8 tests/test-clone.t
> --- a/tests/test-clone.t	Thu Aug 12 18:30:06 2010 +0200
> +++ b/tests/test-clone.t	Thu Aug 12 18:30:24 2010 +0200
> @@ -431,3 +431,13 @@
>  
>    $ rm -r ua
>  
> +cat <<EOF > branchclone.py
> +from mercurial import ui, hg
> +myui = ui.ui()
> +repo = hg.repository(myui, 'a')
> +hg.clone(myui, repo, dest="ua", branch=["stable",])
> +EOF
> +
> +python branchclone.py
> +rm -r ua
> +

test-clone.t has been converted to unified kind (*.t) in default branch,
which means copy/pasting shell code verbatim cripples that code it into
(dead) comment.

It passes testing, but doesn't do anything (I think).