lp://staging/~zyga/bzr/find_ancestors

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp://staging/bzr

Zygmunt Krynicki (community): Needs Information on 2012-10-10

Martin Packman (community): Needs Fixing on 2012-10-10

Diff: 41 lines (+13/-0)

2 files modified

bzrlib/btree_index.py (+3/-0)
bzrlib/index.py (+10/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #541626: 'BTreeBuilder' object has no attribute '_find_ancestors'

High

Fix Released

Link a bug report

Related blueprints

6569. By Zygmunt Krynicki on 2012-10-02

Have CombinedIndex.find_ancestry() skip BTreeBuilder instances

This apparantly works around bug https://bugs.launchpad.net/bzr/+bug/541626
As the comment states I don't really know how correct that is but it seems to
produce proper results for the things that affected me and it no longer crashes
bzr in that case.

I could not move the import statement to the top as that made it fail. It is
probably related to some internal bzr import hook.

6568. By Zygmunt Krynicki on 2012-10-02

Add stub for BTreeBuilder._find_ancestors()

This replaces confusing AttributeErrors with something that is easier to
understand. This is related to bug https://bugs.launchpad.net/bzr/+bug/541626

6567. By Patch Queue Manager <email address hidden> on 2012-09-28

(vila) Fix typo in an error message from the 'revno' command. (Matthew
 Fuller)

6566. By Patch Queue Manager <email address hidden> on 2012-09-27

(vila) Add reference to configuration in 'bzr help env-variables' (Robert
 Collins)

6565. By Patch Queue Manager <email address hidden> on 2012-09-20

(vila) Fix bug number (388275) for progress bar config option
 (Vincent Ladeuil)

6564. By Patch Queue Manager <email address hidden> on 2012-09-19

(vila) Add a config option for the progress bar type. (Vincent Ladeuil)

6563. By Patch Queue Manager <email address hidden> on 2012-09-19

(jam) Merge bzr-2.5.2-dev into bzr trunk to get the ConnectionReset
 fixes.

6562. By Patch Queue Manager <email address hidden> on 2012-09-19

(vila) Clarify option references expansion for `bzr config`. (Vincent
 Ladeuil)

6561. By Patch Queue Manager <email address hidden> on 2012-09-17

(vila) Fix obscure and misleading warning when trying to delete an unknown
 config option. (Vincent Ladeuil)

6560. By Patch Queue Manager <email address hidden> on 2012-09-17

(vila) Remove obsolete (and not used anymore) code and its associated tests
 (covered by other tests in test_http.py). (Vincent Ladeuil)