Assertion failure in _process_entry
Aaron Bentley
aaron.bentley at utoronto.ca
Fri Mar 9 17:21:38 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
John Arbash Meinel wrote:
> Aaron Bentley wrote:
>> Dirstate doesn't seem to handle comparisons involving absent files very
>> well. Personally, I don't understand why dirstate is recording absent
>> files at all. But anyhow...
>
> We store all records next to eachother. So if a file is present in any
> of THIS or PARENTS we have to have a record for it. If it isn't present
> in all trees, some of them will have an "absent" record.
Well, I'd have thought it would make more sense to not have a record at all.
> I wonder if you have pending merges, which are causing the record to
> have to be duplicated.
Yes, I do have pending merges. From the steps-to-reproduce:
~/sandbox$ bzr merge ../sandbox2
+N foo.OTHER
Contents conflict in foo
1 conflicts encountered.
~/sandbox$ bzr status
bzr: ERROR: exceptions.AssertionError: don't know how to compare
source_minikind='a', target_minikind='r'
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFF8Zei0F+nu1YWqI0RAgHBAKCEs6Iotuu8XL5TIVp/SCpkEJoDPwCfbEyy
fvRFFStNg1qqDbgxbnHnS+M=
=uKLM
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list