← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Vincent Ladeuil
  • Date: 2009-09-09 15:43:52 UTC
  • mfrom: (4672.3.4 merge-strict)
  • mto: This revision was merged to the branch mainline in revision 4682.
  • Revision ID: v.ladeuil+lp@free.fr-20090909154352-zmyiya46nukx3vu7
https://launchpad.net/bugs/426344
Handle pending merges as uncommitted changes

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