~bzr-pqm/bzr/bzr.dev

Committer: Canonical.com Patch Queue Manager
Date: 2011-02-08 12:50:51 UTC
mfrom: (5609.17.3 715058-resolve-text-subdir)
mto: (5651.1.1 trunk) (5652.2.1 715000-more-fallbacks) (5609.20.1 2.3.1-dev) (5655.1.1 trunk) (5675.1.1 trunk) (5695.1.1 merge-2.3-to-trunk) (5713.1.1 trunk) (5582.13.2 654733-xmlrpc-failures) (5722.1.1 trunk) (5731.1.1 merge-2.3-into-devel) (5740.1.1 integration) (5050.72.2 whoami) (5753.1.1 integration) (5752.2.1 2.4-transform-cache-sha-740932) (5779.2.1 trunk) (4797.86.2 preview-pull-760152) (5793.3.1 integration) (5810.1.1 trunk) (5853.1.2 trunk) (5881.1.1 trunk) (5905.1.1 merge-2.3-into-devel) (5965.1.1 trunk) (5979.1.1 trunk) (6015.5.1 2.4.0-dev)
mto: This revision was merged to the branch mainline in revision 5652.
Revision ID: pqm@pqm.ubuntu.com-20110208125051-fpbdtofhgv7pwzgc

(vila) Handle test conflict resolution in subdirs. (Vincent Ladeuil)

added added

removed removed

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

or undesirable results.

* Correctly resolve text conflicts for files in subdirs.

(Vincent Ladeuil, #715058)

* Restore proper logging of bytes transferred. We accidentally reset the

counter when commands finished before we logged the total transferred.

(John Arbash Meinel, #713258)