~bzr-pqm/bzr/bzr.dev

Committer: Canonical.com Patch Queue Manager
Date: 2011-08-10 09:38:09 UTC
mfrom: (6015.14.1 bzr24-filter-809901)
mto: (6015.24.1 2.4) (6060.2.1 trunk) (6069.1.1 trunk) (6089.1.1 trunk) (6090.1.1 trunk) (6092.1.1 810701-lang-not-set) (6093.1.1 trunk) (6104.1.1 2.5-get_cached_parent_map-388269) (6123.1.6 +trunk) (6169.2.2 overflow_pack_stat_683191_706957) (6133.1.1 trunk) (6165.1.1 trunk) (6191.1.1 trunk) (6201.1.1 dev_2.4_integration) (6205.1.1 2.4-into-2.5) (6206.1.1 2.5-client-reconnect-819604) (6232.1.1 dev_2.4_integration) (6234.1.1 trunk) (6256.1.1 dev_2.4_integration) (6344.1.1 dev_2.4_integration) (6437.2.1 2.5b5-dev) (6082.5.1 expand-in-stack)
mto: This revision was merged to the branch mainline in revision 6066.
Revision ID: pqm@pqm.ubuntu.com-20110810093809-perfac4es3i9goy3

(jameinel) Use a set during Inventory.filter() to handle when a file is
referenced multiple times. (bug #809901) (Bastian)

added added

removed removed

.. Fixes for situations where bzr would previously crash or give incorrect

or undesirable results.

* A call to CHKInventory's filter-method will not result in a

DuplicateFileId error, if you move a subfolder and change a file in

that subfolder.

(Bastian Bowe, #809901)

* Accessing a packaging branch on Launchpad (eg, ``lp:ubuntu/bzr``) now

checks to see if the most recent published source package version for

that project is present in the branch tags. This should help developers