← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Martin Pool
  • Date: 2009-09-15 01:52:34 UTC
  • mfrom: (4685 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4689.
  • Revision ID: mbp@sourcefrog.net-20090915015234-lbvl4euj2z353zjl
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
37
37
* ``bzr info -v`` on a 2a format still claimed that it was a "Development
38
38
  format" (John Arbash Meinel, #424392)
39
39
 
 
40
* ``bzr merge`` and ``bzr remove-tree`` now requires --force if pending
 
41
  merges are present in the working tree.
 
42
  (Vincent Ladeuil, #426344)
 
43
 
40
44
* Clearer message when Bazaar runs out of memory, instead of a ``MemoryError``
41
45
  traceback.  (Martin Pool, #109115)
42
46
 
65
69
  repository, such as revisions without inventories or inventories without
66
70
  chk_bytes root records.
67
71
  (Andrew Bennetts, #423506)
 
72
 
 
73
* Make sure that we unlock the tree if we fail to create a TreeTransform
 
74
  object when doing a merge, and there is limbo, or pending-deletions
 
75
  directory.  (Gary van der Merwe, #427773)
68
76
  
69
77
Improvements
70
78
************
706
714
 
707
715
bzr 1.17
708
716
########
709
 
 
710
717
:Codename: so-late-its-brunch
711
718
:1.17rc1: 2009-07-13
712
719
:1.17: 2009-07-20