← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to NEWS

  • Committer: Robert Collins
  • Date: 2010-01-28 18:01:03 UTC
  • mto: (4797.2.5 2.1)
  • mto: This revision was merged to the branch mainline in revision 4989.
  • Revision ID: robertc@robertcollins.net-20100128180103-kj106kj55vsbqxu1
Refactor NewsMerger into a reusable base class merge.ConfigurableFileMerger.

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
14
14
* The new ``merge_file_content`` hook point has been altered to provide a
15
15
  better API where state for extensions can be stored rather than the
16
16
  too-simple function based approach. This fixes a performance regression
17
 
  where branch configuration would be parsed per-file during merge.
 
17
  where branch configuration would be parsed per-file during merge. As
 
18
  part of this the included news_merger has been refactored into a base
 
19
  helper class ``bzrlib.merge.ConfigurableFileMerger``.
18
20
  (Robert Collins, John Arbash Meinel, #513822)
19
21
 
20
22
bzr 2.1.0rc1