Annotation oddness
Aaron Bentley
aaron.bentley at utoronto.ca
Mon Jun 19 19:03:04 BST 2006
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
John Arbash Meinel wrote:
> Going back to the knit index, it shows that there is no other parent for
> that specific fulltext. I think it was a bug in our early implementation
> of knit indexes.
I don't think it was knits, because they were merged into the mainline
in 1596, but my revision was merged in 1390. But I do recall a problem
with weaves that caused us to have multiple copies of a weave text.
Perhaps that was the root cause, and was carried over in the weave ->
knit conversion.
> I think there was a bug in bzr in the past. I don't know which one it
> was. We had the merge bug where once a file was merged, all descendants
> thought that you had 2 parents and would create a new entry.
>
> I think this is probably solvable if we regenerate the knits by walking
> revisions => inventories => knits.
>
> By walking revisions we are guaranteed to get the correct parent
> revision ids, and by walking inventories, we are guaranteed to get the
> right files modified.
Hmm. I wonder if I can pull a bundle of bzr.dev into a new branch...
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFElubY0F+nu1YWqI0RArDoAJ4l8oMibmDOeJYimLAusKptd02wbgCeKrSg
mMSc7ClhuWsMswX+LmuHQn4=
=OAFO
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list