~bzr-pqm/bzr/bzr.dev

Committer: Canonical.com Patch Queue Manager
Date: 2011-07-13 00:48:39 UTC
mfrom: (6015.4.2 backports-2.4)
mto: (6015.14.1 bzr24-filter-809901) (6026.1.1 trunk) (6031.1.1 integration) (6046.1.1 integration) (6060.2.1 trunk) (6069.1.1 trunk) (6082.5.1 expand-in-stack) (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) (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) (6206.1.1 2.5-client-reconnect-819604)
mto: This revision was merged to the branch mainline in revision 6027.
Revision ID: pqm@pqm.ubuntu.com-20110713004839-rkdceu7bli2c7ihv

(spiv) selftest speedup and infrastructure improvement from lp:bzr r6018 and
r6020. (Andrew Bennetts)

added added

removed removed

suite. This can include new facilities for writing tests, fixes to

spurious test failures and changes to the way things should be tested.

* `BranchBuilder.build_snapshot` now supports a "flush" action. This

cleanly and reliably allows tests using `BranchBuilder` to construct

branches that e.g. rename files out of a directory and unversion that

directory in the same revision. Previously some changes were impossible

due to the order that `build_snapshot` performs its actions.

(Andrew Bennetts)

* `TestCaseWithMemoryTransport` is faster now: `_check_safety_net` now

just compares the bytes in the dirstate file to its pristine state,

rather than opening the WorkingTree and calling ``last_revision()``.

This reduces the overall test suite time by about 10% on my laptop.

(Andrew Bennetts)

bzr 2.4b5

#########