Stacktrace on error when trying to merge two heads.
Dennis Au
dennis.au at virgincharter.com
Tue Apr 29 15:26:29 UTC 2008
I will try that. Thank you.
Dennis
On 4/28/08 11:20 PM, "Patrick Mézard" <pmezard at gmail.com> wrote:
> Dennis Au a écrit :
>> 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)
>
> [...]
>
>> File
>> "/Library/Python/2.5/site-packages/mercurial-1.0-py2.5-macosx-10.5-i386.egg/m
>> ercurial/copies.py",
>> line 100, in checkcopies
>> if ca and ca.path() == f or ca.path() == c2.path():
>> AttributeError: 'NoneType' object has no attribute 'path'
>
> It's fixed in main development repository by 3ee6f1fce94a
> (http://hg.intevation.org/mercurial/rev/3ee6f1fce94a).
>
> --
> Patrick Mézard
More information about the Mercurial
mailing list