[issue1168] unknown exception thrown in merge
Bernard Hurley
mercurial-bugs at selenic.com
Fri Jun 6 20:58:50 CDT 2008
New submission from Bernard Hurley <bernard at phonecoop.coop>:
The following happened when I tried to merge some changes into my repository:
** unknown exception encountered, details follow
** report bug details to http://www.selenic.com/mercurial/bts
** or mercurial at selenic.com
** Mercurial Distributed SCM (version 1.0)
Traceback (most recent call last):
File "/usr/bin/hg", line 20, in <module>
mercurial.dispatch.run()
File "/var/lib/python-support/python2.5/mercurial/dispatch.py", line 20, in run
sys.exit(dispatch(sys.argv[1:]))
File "/var/lib/python-support/python2.5/mercurial/dispatch.py", line 29, in
dispatch
return _runcatch(u, args)
File "/var/lib/python-support/python2.5/mercurial/dispatch.py", line 45, in
_runcatch
return _dispatch(ui, args)
File "/var/lib/python-support/python2.5/mercurial/dispatch.py", line 364, in
_dispatch
ret = _runcommand(ui, options, cmd, d)
File "/var/lib/python-support/python2.5/mercurial/dispatch.py", line 417, in
_runcommand
return checkargs()
File "/var/lib/python-support/python2.5/mercurial/dispatch.py", line 373, in
checkargs
return cmdfunc()
File "/var/lib/python-support/python2.5/mercurial/dispatch.py", line 356, in
<lambda>
d = lambda: func(ui, repo, *args, **cmdoptions)
File "/var/lib/python-support/python2.5/mercurial/commands.py", line 1888, in
merge
return hg.merge(repo, node, force=force)
File "/var/lib/python-support/python2.5/mercurial/hg.py", line 293, in merge
stats = _merge.update(repo, node, True, force, False)
File "/var/lib/python-support/python2.5/mercurial/merge.py", line 392, in update
action += manifestmerge(repo, wc, p2, pa, overwrite, partial)
File "/var/lib/python-support/python2.5/mercurial/merge.py", line 104, in
manifestmerge
copy, diverge = copies.copies(repo, p1, p2, pa)
File "/var/lib/python-support/python2.5/mercurial/copies.py", line 122, in copies
checkcopies(f, m1, m2)
File "/var/lib/python-support/python2.5/mercurial/copies.py", line 100, in
checkcopies
if ca and ca.path() == f or ca.path() == c2.path():
AttributeError: 'NoneType' object has no attribute 'path'
How can I fix my repository now?
----------
messages: 6191
nosy: Bernard Hurley
priority: urgent
status: unread
title: unknown exception thrown in merge
____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1168>
____________________________________________________
More information about the Mercurial-devel
mailing list