~bzr-pqm/bzr/bzr.dev

Viewing changes to NEWS

Committer: Canonical.com Patch Queue Manager
Date: 2010-01-12 23:45:36 UTC
mfrom: (4634.123.13 2.0.4-dirstate-set-root-504390)
mto: (4634.128.1 2.0) (4957.1.1 jam-integration) (4964.1.1 integration) (4967.1.1 jam-integration) (4981.1.2 2.1.0rc1-dev) (4999.3.1 apport) (4797.17.1 alias-loc-docs-337834-2.1) (5051.4.1 376388-dot-bazaar-ownership) (5045.1.1 369501-version) (5346.4.1 cleanup) (5174.1.1 jam-integration) (5074.5.1 fix-523746-dev)
mto: This revision was merged to the branch mainline in revision 4959.
Revision ID: pqm@pqm.ubuntu.com-20100112234536-o7k4xeantero4ohj

(jam) Fix bug #504390 and root-id handling for update and pull

added added

removed removed

* ``TreeTransform`` can now handle when a delta says that the file id for

the tree root changes. Rather than trying to rename your working

directory, or failing early saying that you can't have multiple

tree roots. This also fixes ``bzr revert`` when the root id changes.

(Currently ``bzr update`` is still broken.)

(John Arbash Meinel, #494269)

tree roots. This also fixes revert, update, and pull when the root id

changes. (John Arbash Meinel, #494269, #504390)

* ``_update_current_block`` no longer suppresses exceptions, so ^C at just

the right time will get propagated, rather than silently failing to move