Stacktrace on error when trying to merge two heads.

[Dennis Au]

I was trying to merge two separate heads and received the following error:
I was trying to merge the default branch into a branch we call inactive.

[21147] dennis at e46mpwr ~/vci/vci_devel $ hg merge -r 7b1fa60c8029
** 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/local/bin/hg", line 5, in <module>
    pkg_resources.run_script('mercurial==1.0', 'hg')
  File 
"/System/Library/Frameworks/Python.framework/Versions/2.5/Extras/lib/python/
pkg_resources.py", line 448, in run_script
    
  File 
"/System/Library/Frameworks/Python.framework/Versions/2.5/Extras/lib/python/
pkg_resources.py", line 1166, in run_script
    script_code = compile(script_text,script_filename,'exec')
  File 
"/Library/Python/2.5/site-packages/mercurial-1.0-py2.5-macosx-10.5-i386.egg/
EGG-INFO/scripts/hg", line 20, in <module>
    mercurial.dispatch.run()
  File 
"/Library/Python/2.5/site-packages/mercurial-1.0-py2.5-macosx-10.5-i386.egg/
mercurial/dispatch.py", line 20, in run
    sys.exit(dispatch(sys.argv[1:]))
  File 
"/Library/Python/2.5/site-packages/mercurial-1.0-py2.5-macosx-10.5-i386.egg/
mercurial/dispatch.py", line 29, in dispatch
    return _runcatch(u, args)
  File 
"/Library/Python/2.5/site-packages/mercurial-1.0-py2.5-macosx-10.5-i386.egg/
mercurial/dispatch.py", line 45, in _runcatch
    return _dispatch(ui, args)
  File 
"/Library/Python/2.5/site-packages/mercurial-1.0-py2.5-macosx-10.5-i386.egg/
mercurial/dispatch.py", line 364, in _dispatch
    ret = _runcommand(ui, options, cmd, d)
  File 
"/Library/Python/2.5/site-packages/mercurial-1.0-py2.5-macosx-10.5-i386.egg/
mercurial/dispatch.py", line 417, in _runcommand
    return checkargs()
  File 
"/Library/Python/2.5/site-packages/mercurial-1.0-py2.5-macosx-10.5-i386.egg/
mercurial/dispatch.py", line 373, in checkargs
    return cmdfunc()
  File 
"/Library/Python/2.5/site-packages/mercurial-1.0-py2.5-macosx-10.5-i386.egg/
mercurial/dispatch.py", line 356, in <lambda>
    d = lambda: func(ui, repo, *args, **cmdoptions)
  File 
"/Library/Python/2.5/site-packages/mercurial-1.0-py2.5-macosx-10.5-i386.egg/
mercurial/commands.py", line 1888, in merge
    return hg.merge(repo, node, force=force)
  File 
"/Library/Python/2.5/site-packages/mercurial-1.0-py2.5-macosx-10.5-i386.egg/
mercurial/hg.py", line 293, in merge
    stats = _merge.update(repo, node, True, force, False)
  File 
"/Library/Python/2.5/site-packages/mercurial-1.0-py2.5-macosx-10.5-i386.egg/
mercurial/merge.py", line 392, in update
    action += manifestmerge(repo, wc, p2, pa, overwrite, partial)
  File 
"/Library/Python/2.5/site-packages/mercurial-1.0-py2.5-macosx-10.5-i386.egg/
mercurial/merge.py", line 104, in manifestmerge
    copy, diverge = copies.copies(repo, p1, p2, pa)
  File 
"/Library/Python/2.5/site-packages/mercurial-1.0-py2.5-macosx-10.5-i386.egg/
mercurial/copies.py", line 124, in copies
    checkcopies(f, m2, m1)
  File 
"/Library/Python/2.5/site-packages/mercurial-1.0-py2.5-macosx-10.5-i386.egg/
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'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20080428/3178656f/attachment-0001.html>