← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/release-notes/bzr-2.3.txt

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-03-03 07:56:45 UTC
  • mfrom: (5695.1.1 merge-2.3-to-trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110303075645-hncdmrbpczkxcvt4
(spiv) Merge lp:bzr/2.3 into lp:bzr,
 including fix for #726584. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/release-notes/bzr-2.3.txt
35
35
* Correctly resolve text conflicts for files in subdirs.
36
36
  (Vincent Ladeuil, #715058)
37
37
 
 
38
* Fix "AssertionError: repository.user_url ... does not match URL from
 
39
  server response" when reusing a smart transport.
 
40
  (Andrew Bennetts, #726584)
 
41
 
38
42
* Restore proper logging of bytes transferred. We accidentally reset the
39
43
  counter when commands finished before we logged the total transferred.
40
44
  (John Arbash Meinel, #713258)