[MERGE][bug 248540] Handle ghosts in mainline a bit better

[Jelmer Vernooij]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Aaron,

Thanks for the review.

Aaron Bentley wrote:
> Jelmer Vernooij wrote:
>> === modified file 'bzrlib/repository.py' --- bzrlib/repository.py
>> 2009-05-12 04:54:04 +0000 +++ bzrlib/repository.py    2009-05-28
>> 16:04:39 +0000 @@ -2244,7 +2244,10 @@ # RevisionNotPresent here
>> until we see a use for it,
> because of the
>> # cost in an inner loop that is by its very nature
> O(history).
>> # Robert Collins 20080326 -            parents =
>> graph.get_parent_map([next_id])[next_id] +            try: +
>> parents = graph.get_parent_map([next_id])[next_id] +
>> except KeyError: +                raise
>> errors.RevisionNotPresent(next_id, self)
>
> You should update or remove Robert's comment.  (Is there any
> observable performance impact?)
Some quick tests didn't show any significant performance impact in
"bzr log", so I've removed the comment.

I've addressed the two issues you raised, and also added mainline
ghost handling for "bzr reconcile".

Cheers,

Jelmer
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iJwEAQECAAYFAkokgKEACgkQDLQl4QYPZuUzfAP+Np4Qp3+nJVhFkYRwXXrAiRSt
yAl7fgRLMLAjGO65YCnkX1WXkj/6mK6ZGGgpSBbMysiHhPgbijjE8mBIyxaGxYjt
A+HRJaqZZmomIUd/xxheHTgSDljNICbtsWxWh3cFj6was/9x4W7deeS8igcdiBv9
izhlz7eL8tE1kHCSsdc=
=UWOa
-----END PGP SIGNATURE-----

-------------- next part --------------
A non-text attachment was scrubbed...
Name: mainline-ghosts.diff
Type: text/x-diff
Size: 17264 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090602/c8e1002a/attachment-0001.bin