← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: John Arbash Meinel
  • Date: 2010-01-29 08:28:47 UTC
  • mfrom: (4797.2.5 2.1)
  • mto: This revision was merged to the branch mainline in revision 4989.
  • Revision ID: john@arbash-meinel.com-20100129082847-pnx07l2xcbenkcrs
Merge the per-file-hook updates.

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
36
36
*******
37
37
 
38
38
 
 
39
bzr 2.1.0rc2 (not released yet)
 
40
###############################
 
41
 
 
42
:Codename: 
 
43
:2.1.0rc2: ???
 
44
 
 
45
API Changes
 
46
***********
 
47
 
 
48
* The new ``merge_file_content`` hook point has been altered to provide a
 
49
  better API where state for extensions can be stored rather than the
 
50
  too-simple function based approach. This fixes a performance regression
 
51
  where branch configuration would be parsed per-file during merge. As
 
52
  part of this the included news_merger has been refactored into a base
 
53
  helper class ``bzrlib.merge.ConfigurableFileMerger``.
 
54
  (Robert Collins, John Arbash Meinel, #513822)
 
55
 
39
56
bzr 2.1.0rc1
40
57
############
41
58