assert failure traceback
Aaron Bentley
aaron.bentley at utoronto.ca
Thu Feb 1 13:06:54 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Martin Pool wrote:
> On 1 Feb 2007, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
>> Tracy Camp wrote:
>>
>>>>> 187, in _compare_trees
>>>>> assert kind[0] == kind[1] or None in kind
>>>>> AssertionError
>> You have changed a file's kind. e.g. turning a file into a directory, a
>> directory into a symlink, a symlink into a file...
>>
>> This is not permitted by bzr.
>>
>> I'm not interested in trying to fix it, because I haven't been able to
>> get approval for a status format that would show kind changes intuitively.
>
> Was the status display format really the only thing that prevents this
> being fixed? If so that's a bit ridiculous.
Yes. In terms of status, we just need to add another list to TreeDelta,
set it, and display it.
In terms of commit, I think my patch is bitrotten.
In terms of merge, the internals support kind change, but I don't have
blackbox tests.
> Since this (kind changes) is something that does actually happen there
> is no point saying it's not supported.
I agree.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFFweXu0F+nu1YWqI0RAhv6AJ9Lpcxwx8Z/DJ+wbyvMXTP8I1MAsACghxfz
fAHJG1X9RVh/qN0x8/vBhmI=
=/VHD
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list