~bzr-pqm/bzr/bzr.dev

Viewing changes to NEWS

Committer: Canonical.com Patch Queue Manager
Date: 2010-02-11 02:47:34 UTC
mfrom: (4797.16.2 fragile-do_merge-cleanup-517275-2.1)
mto: (4797.18.1 merge-2.0-into-2.1) (5031.1.2 merge-2.1-into-devel) (5036.1.1 integration) (4763.2.4 jam-integration) (5053.1.1 integration) (5068.1.1 integration) (5074.1.1 integration) (5080.2.1 merge-2.1-into-devel) (5110.1.1 integration) (5050.4.1 2.2) (5159.1.1 integration) (5197.1.1 merge-2.1-into-devel) (5241.2.1 trunk) (5258.1.1 diff-header-encoding) (5244.1.1 trunk) (5263.1.1 trunk) (5297.1.1 integration) (5609.33.5 2.3) (6015.55.2 2.4-feature-flags)
mto: This revision was merged to the branch mainline in revision 5033.
Revision ID: pqm@pqm.ubuntu.com-20100211024734-aiture0rgvqnl1dc

(andrew) Replace several fragile try/finally blocks in merge.py using
bzrlib.cleanup. (#517275)

added added

removed removed

* The new ``merge_file_content`` should now be ok with tests to avoid

regressions.

(Vincent Ladeuil, #515597)

Internals

*********

* Use ``bzrlib.cleanup`` rather than less robust ``try``/``finally``

blocks in several places in ``bzrlib.merge``. This avoids masking prior

errors when errors like ``ImmortalPendingDeletion`` occur during cleanup

in ``do_merge``.

(Andrew Bennetts, #517275)

API Changes

***********