[MERGE/RFC] get 'bzr log' to work when there is a ghost in mainline
John Arbash Meinel
john at arbash-meinel.com
Fri Jun 27 17:16:24 BST 2008
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
We still haven't fixed all the bugs wrt ghosts in the mainline history.
https://bugs.edge.launchpad.net/bzr/+bug/243536
Is one. Basically the code which updates the "mainline" history is
breaking because it is getting a node with no parents.
This patch fixes that case, and allows "bzr log --long" to work again.
Other places I know of are "bzr reconcile" which uses a raw
"iter_reverse_revision_history()" because we *want* to make sure that
the 'revision_history' is actually correct. (So thunking over to
'Branch.revision_history()' would not be fixing the bug.)
This was a 10-min fix, and I mostly went this route because we don't
really support having your branch history be anything but left-hand
ancestors anyway.
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEARECAAYFAkhlElgACgkQJdeBCYSNAANL1gCfWHReK4gdxXZYJvzskmFLWAk+
2gMAmwYhX/xQ9D6cyGWqgvAWgIlaMCnz
=016E
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: bug243536.diff
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20080627/b6349042/attachment.diff
More information about the bazaar
mailing list