[issue1093] hg merge creates an exception

[helix]

New submission from helix <contact at julienhuang.com>:

I'm extensively using hg copy & hg rename in my repo with binary files
(Photoshop, etc...) and text files.

$ hg --version
Mercurial Distributed SCM (version 1e4ddc9ac9f7)

Copyright (C) 2005-2008 Matt Mackall <mpm at selenic.com> and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
$ hg pull
pulling from /Users/helix/projects/master_branch
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 75 changes to 75 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg merge
** unknown exception encountered, details follow
** report bug details to http://www.selenic.com/mercurial/bts
** or mercurial at selenic.com
** Mercurial Distributed SCM (version 1e4ddc9ac9f7)
Traceback (most recent call last):
  File "/usr/local/bin/hg", line 20, in <module>
    mercurial.dispatch.run()
  File "/Library/Python/2.5/site-packages/mercurial/dispatch.py", line 20, in run
    sys.exit(dispatch(sys.argv[1:]))
  File "/Library/Python/2.5/site-packages/mercurial/dispatch.py", line 29, in
dispatch
    return _runcatch(u, args)
  File "/Library/Python/2.5/site-packages/mercurial/dispatch.py", line 45, in
_runcatch
    return _dispatch(ui, args)
  File "/Library/Python/2.5/site-packages/mercurial/dispatch.py", line 364, in
_dispatch
    ret = _runcommand(ui, options, cmd, d)
  File "/Library/Python/2.5/site-packages/mercurial/dispatch.py", line 417, in
_runcommand
    return checkargs()
  File "/Library/Python/2.5/site-packages/mercurial/dispatch.py", line 373, in
checkargs
    return cmdfunc()
  File "/Library/Python/2.5/site-packages/mercurial/dispatch.py", line 356, in
<lambda>
    d = lambda: func(ui, repo, *args, **cmdoptions)
  File "/Library/Python/2.5/site-packages/mercurial/commands.py", line 1888, in
merge
    return hg.merge(repo, node, force=force)
  File "/Library/Python/2.5/site-packages/mercurial/hg.py", line 293, in merge
    stats = _merge.update(repo, node, True, force, False)
  File "/Library/Python/2.5/site-packages/mercurial/merge.py", line 392, in update
    action += manifestmerge(repo, wc, p2, pa, overwrite, partial)
  File "/Library/Python/2.5/site-packages/mercurial/merge.py", line 104, in
manifestmerge
    copy, diverge = copies.copies(repo, p1, p2, pa)
  File "/Library/Python/2.5/site-packages/mercurial/copies.py", line 122, in copies
    checkcopies(f, m1, m2)
  File "/Library/Python/2.5/site-packages/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'

----------
messages: 5921
nosy: helix
priority: critical
status: unread
title: hg merge creates an exception

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