[issue2786] unknown exception encountered after merging due to rebase -d tip
Jack Hayward
bugs at mercurial.selenic.com
Tue May 3 06:33:30 UTC 2011
New submission from Jack Hayward <jack.hayward at oracle.com>:
After running rebase -d tip and merging all files, I got the error below.
> hg rebase -d tip
merging src/gm/ys/src/host_mbox.c
merging src/hostconfig/ys/Makefile.shared
merging src/hostconfig/ys/common/include/mcstate.h
merging src/hostconfig/ys/common/include/seq_impl.h
merging src/hostconfig/ys/common/include/sram.h
merging src/hostconfig/ys/common/src/seq.c
merging src/hostconfig/ys/common/src/seq_subr.c
** unknown exception encountered, please report by visiting
** http://mercurial.selenic.com/wiki/BugTracker
** Python 2.7.1 (r271:86832, Apr 15 2011, 18:13:32) [C]
** Mercurial Distributed SCM (version 1.8.3)
** Extensions loaded: validate_RTI, cdm, hgk, convert, fetch, children,
graphlog, mq, rebase
Traceback (most recent call last):
File "/pkg/local/bin//hg", line 38, in <module>
mercurial.dispatch.run()
File "/pkg/local/lib/python2.7/site-packages/mercurial/dispatch.py", line
16, in run
sys.exit(dispatch(sys.argv[1:]))
File "/pkg/local/lib/python2.7/site-packages/mercurial/dispatch.py", line
36, in dispatch
return _runcatch(u, args)
File "/pkg/local/lib/python2.7/site-packages/mercurial/dispatch.py", line
58, in _runcatch
return _dispatch(ui, args)
File "/pkg/local/lib/python2.7/site-packages/mercurial/dispatch.py", line
601, in _dispatch
cmdpats, cmdoptions)
File "/pkg/local/lib/python2.7/site-packages/mercurial/dispatch.py", line
406, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "/pkg/local/lib/python2.7/site-packages/mercurial/dispatch.py", line
655, in _runcommand
return checkargs()
File "/pkg/local/lib/python2.7/site-packages/mercurial/dispatch.py", line
609, in checkargs
return cmdfunc()
File "/pkg/local/lib/python2.7/site-packages/mercurial/dispatch.py", line
598, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
File "/pkg/local/lib/python2.7/site-packages/mercurial/util.py", line 433,
in check
return func(*args, **kwargs)
File "/pkg/local/lib/python2.7/site-packages/mercurial/extensions.py",
line 133, in wrap
util.checksignature(origfn), *args, **kwargs)
File "/pkg/local/lib/python2.7/site-packages/mercurial/util.py", line 433,
in check
return func(*args, **kwargs)
File "/pkg/local/lib/python2.7/site-packages/hgext/mq.py", line 3049, in
mqcommand
return orig(ui, repo, *args, **kwargs)
File "/pkg/local/lib/python2.7/site-packages/mercurial/util.py", line 433,
in check
return func(*args, **kwargs)
File "/pkg/local/lib/python2.7/site-packages/hgext/rebase.py", line 213,
in rebase
repair.strip(ui, repo, repo[min(rebased)].node(), "all")
File "/pkg/local/lib/python2.7/site-packages/mercurial/repair.py", line
123, in strip
backupfile = _bundle(repo, [node], cl.heads(), node, 'backup')
File "/pkg/local/lib/python2.7/site-packages/mercurial/repair.py", line
16, in _bundle
cg = repo.changegroupsubset(bases, heads, 'strip', extranodes)
File "/pkg/local/lib/python2.7/site-packages/mercurial/localrepo.py", line
1490, in changegroupsubset
self.hook('preoutgoing', throw=True, source=source)
File "/pkg/local/lib/python2.7/site-packages/mercurial/localrepo.py", line
228, in hook
return hook.hook(self.ui, self, name, throw, **args)
File "/pkg/local/lib/python2.7/site-packages/mercurial/hook.py", line 147,
in hook
mod = extensions.loadpath(path, 'hghook.%s' % hname)
File "/pkg/local/lib/python2.7/site-packages/mercurial/extensions.py",
line 41, in loadpath
return imp.load_source(module_name, path)
File "/pkg/local/lib/python2.7/site-packages/onbld/hgext/cdm.pyc", line 1
SyntaxError: Non-ASCII character '\xf3' in file
/pkg/local/lib/python2.7/site-packages/onbld/hgext/cdm.pyc on line 1, but
no encoding declared; see http://www.python.org/peps/pep-0263.html for details
----------
messages: 16131
nosy: jhayward
priority: bug
status: unread
title: unknown exception encountered after merging due to rebase -d tip
____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2786>
____________________________________________________
More information about the Mercurial-devel
mailing list