[issue2038] rebase fails with "TypeError: b2a_hex() argument 1 must be string"

Willem Verstraeten bugs at mercurial.selenic.com
Fri Feb 12 05:49:23 CST 2010


New submission from Willem Verstraeten <willem.verstraeten at gmail.com>:

When executing following command for the repository at 
http://bitbucket.org/willemv/hg4idea-rebase-bug/

> hg rebase -s a92b2fd2453f -d bcd1d95c2e18

I get following output and final exception (after resolving all the 
conflicts of the merge)

tool kdiff3 can't handle symlinks
 no tool found to merge idea-dev
keep (l)ocal or take (o)ther? l
merging src/main/java/org/zmlx/hg4idea/provider/annotate/HgAnnotation.java 
and src/org/zmlx/hg4idea/provider/annotate/HgAnnotation.java to 
src/main/java/org/zmlx/hg4idea/provider/annotate/HgAnnotation.java
merging src/main/resources/META-INF/plugin.xml and META-INF/plugin.xml to 
src/main/resources/META-INF/plugin.xml
merging src/test/java/org/zmlx/hg4idea/HgAddTestCase.java and 
test/org/zmlx/hg4idea/HgAddTestCase.java to 
src/test/java/org/zmlx/hg4idea/HgAddTestCase.java
merging src/test/java/org/zmlx/hg4idea/HgCopyTestCase.java and 
test/org/zmlx/hg4idea/HgCopyTestCase.java to 
src/test/java/org/zmlx/hg4idea/HgCopyTestCase.java
merging src/test/java/org/zmlx/hg4idea/HgDeleteTestCase.java and 
test/org/zmlx/hg4idea/HgDeleteTestCase.java to 
src/test/java/org/zmlx/hg4idea/HgDeleteTestCase.java
merging src/test/java/org/zmlx/hg4idea/HgMoveTestCase.java and 
test/org/zmlx/hg4idea/HgMoveTestCase.java to 
src/test/java/org/zmlx/hg4idea/HgMoveTestCase.java
merging src/test/java/org/zmlx/hg4idea/HgRenameTestCase.java and 
test/org/zmlx/hg4idea/HgRenameTestCase.java to 
src/test/java/org/zmlx/hg4idea/HgRenameTestCase.java
merging src/test/java/org/zmlx/hg4idea/HgTestCase.java and 
test/org/zmlx/hg4idea/HgTestCase.java to 
src/test/java/org/zmlx/hg4idea/HgTestCase.java
transaction abort!
rollback completed
** unknown exception encountered, details follow
** report bug details to http://mercurial.selenic.com/bts/
** or mercurial at selenic.com
** Mercurial Distributed SCM (version 1.4.3)
** Extensions loaded: rebase
Traceback (most recent call last):
  File "/usr/local/bin/hg", line 5, in <module>
    pkg_resources.run_script('mercurial==1.4.3', 'hg')
  File "/usr/lib/python2.6/dist-packages/pkg_resources.py", line 448, in 
run_script
    self.require(requires)[0].run_script(script_name, ns)
  File "/usr/lib/python2.6/dist-packages/pkg_resources.py", line 1166, in 
run_script
    execfile(script_filename, namespace, namespace)
  File "/usr/local/lib/python2.6/dist-packages/mercurial-1.4.3-py2.6-linux-
i686.egg/EGG-INFO/scripts/hg", line 27, in <module>
    mercurial.dispatch.run()
  File "/usr/local/lib/python2.6/dist-packages/mercurial-1.4.3-py2.6-linux-
i686.egg/mercurial/dispatch.py", line 16, in run
    sys.exit(dispatch(sys.argv[1:]))
  File "/usr/local/lib/python2.6/dist-packages/mercurial-1.4.3-py2.6-linux-
i686.egg/mercurial/dispatch.py", line 30, in dispatch
    return _runcatch(u, args)
  File "/usr/local/lib/python2.6/dist-packages/mercurial-1.4.3-py2.6-linux-
i686.egg/mercurial/dispatch.py", line 46, in _runcatch
    return _dispatch(ui, args)
  File "/usr/local/lib/python2.6/dist-packages/mercurial-1.4.3-py2.6-linux-
i686.egg/mercurial/dispatch.py", line 454, in _dispatch
    return runcommand(lui, repo, cmd, fullargs, ui, options, d)
  File "/usr/local/lib/python2.6/dist-packages/mercurial-1.4.3-py2.6-linux-
i686.egg/mercurial/dispatch.py", line 324, in runcommand
    ret = _runcommand(ui, options, cmd, d)
  File "/usr/local/lib/python2.6/dist-packages/mercurial-1.4.3-py2.6-linux-
i686.egg/mercurial/dispatch.py", line 505, in _runcommand
    return checkargs()
  File "/usr/local/lib/python2.6/dist-packages/mercurial-1.4.3-py2.6-linux-
i686.egg/mercurial/dispatch.py", line 459, in checkargs
    return cmdfunc()
  File "/usr/local/lib/python2.6/dist-packages/mercurial-1.4.3-py2.6-linux-
i686.egg/mercurial/dispatch.py", line 453, in <lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File "/usr/local/lib/python2.6/dist-packages/mercurial-1.4.3-py2.6-linux-
i686.egg/mercurial/util.py", line 386, in check
    return func(*args, **kwargs)
  File "/usr/local/lib/python2.6/dist-packages/mercurial-1.4.3-py2.6-linux-
i686.egg/hgext/rebase.py", line 120, in rebase
    collapsef, extrafn)
  File "/usr/local/lib/python2.6/dist-packages/mercurial-1.4.3-py2.6-linux-
i686.egg/hgext/rebase.py", line 231, in rebasenode
    extrafn=extrafn)
  File "/usr/local/lib/python2.6/dist-packages/mercurial-1.4.3-py2.6-linux-
i686.egg/hgext/rebase.py", line 181, in concludenode
    date=repo[rev].date(), extra=extra)
  File "/usr/local/lib/python2.6/dist-packages/mercurial-1.4.3-py2.6-linux-
i686.egg/mercurial/localrepo.py", line 832, in commit
    ret = self.commitctx(cctx, True)
  File "/usr/local/lib/python2.6/dist-packages/mercurial-1.4.3-py2.6-linux-
i686.egg/mercurial/localrepo.py", line 877, in commitctx
    changed)
  File "/usr/local/lib/python2.6/dist-packages/mercurial-1.4.3-py2.6-linux-
i686.egg/mercurial/localrepo.py", line 723, in _filecommit
    self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev)))
TypeError: b2a_hex() argument 1 must be string or read-only buffer, not None

----------
messages: 11680
nosy: willemv
priority: bug
status: unread
title: rebase fails with "TypeError: b2a_hex() argument 1 must be string"

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2038>
____________________________________________________


More information about the Mercurial-devel mailing list