Comment 4 for bug 103870

Revision history for this message
Alexander Belchenko (bialix) wrote : Re: [Bug 103870] Re: diff on modified file in directory moved to newly added directory fails

John A Meinel пишет:
> Alexander Belchenko wrote:
>> Another user report about this bug in ML.
>>
>> aLTer wrote:
>>
>> $ bzr di>d.diff
>> bzr: ERROR: exceptions.TypeError: unsupported operand type(s) for +:
>> 'NoneType' and 'int'
>
> It seems we are returning a timestamp of None (and I think the reason
> was reasonable, but I'm not sure why now).
>
> Otherwise I wasn't sure why it was failing.
>
> I think the timestamp was None because the file on disk was gone (so
> what timestamp would you give it?)

No! File is not gone, file is moved, because parent directory is moved.

> I'm not sure why it would have worked in the past...

This bug exist only in dirstate-based working tree.

[µ]