hg merge: TypeError

[Matt Mackall]

On Wed, Jun 01, 2005 at 02:54:19AM +0300, Michael S. Tsirkin wrote:
> Hi!
> Tried to look at mercurial, but ...
> 
> >hg init
> >hg merge 'http://selenic.com/hg'
> searching for changes
> Traceback (most recent call last):
>   File "/usr/local/bin/hg", line 420, in ?
>     cg = repo.getchangegroup(other)
>   File "/usr/local/lib/python2.4/site-packages/mercurial/hg.py", line
> 536, in getchangegroup
>     tip = remote.branches([])[0]
>   File "/usr/local/lib/python2.4/site-packages/mercurial/hg.py", line
> 859, in branches
>     br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ]
>   File "/usr/local/lib/python2.4/site-packages/mercurial/revlog.py",
> line 15, in bin
>     def bin(node): return binascii.unhexlify(node)
> TypeError: Non-hexadecimal digit found
> Exit 1
> 
> I'm behind a proxy, could that be the problem, somehow?

Maybe. Can you stick a:

print "got", d

above this:

>   File "/usr/local/lib/python2.4/site-packages/mercurial/hg.py", line
> 859, in branches
>     br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ]

That'll tell us what we think the other side sent back.

-- 
Mathematics is the supreme nostalgia of our time.