← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-07-20 13:31:43 UTC
  • mfrom: (1551.15.54 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20070720133143-r74lo566tluurmfp
fix annotate merge to not require Tree.get_weave

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
43
43
    * New bundle and merge directive formats are faster to generate, and
44
44
      more robust against email mangling.  (Aaron Bentley)
45
45
 
 
46
    * Annotate merge now works when there are local changes. (Aaron Bentley)
 
47
 
46
48
  LIBRARY API BREAKS:
47
49
 
48
50
    * Deprecated dictionary ``bzrlib.option.SHORT_OPTIONS`` removed.
77
79
 
78
80
    * Deprecated ``change_entry`` in transform.py. (Ian Clatworthy)
79
81
 
 
82
    * RevisionTree.get_weave is now deprecated.  Tree.plan_merge is now used
 
83
      for performing annotate-merge.  (Aaron Bentley)
 
84
 
80
85
  TESTING:
81
86
 
82
87
    * Remove selftest ``--clean-output``, ``--numbered-dirs`` and