/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to doc/news-template.txt

  • Committer: Vincent Ladeuil
  • Date: 2009-01-23 21:06:48 UTC
  • mto: (3966.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3967.
  • Revision ID: v.ladeuil+lp@free.fr-20090123210648-yfb39g22yyo83d3y
Slight refactoring and test fixing.

* bzrlib/tests/test_merge.py:
(TestMergerEntriesLCAOnDisk.test_modified_symlink): Passing now.

* bzrlib/merge.py:
(Merge3Merger._lca_multi_way): Fix doc reference.
(Merge3Merger.merge_contents.contents_conflict): Try to delay
this_pair evaulation to avoid unnecessary sha1 (impyling file read
from disk) calculation. Also slightly refactor to avoid repeated
file_id in trees calculations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/news-template.txt
 
1
 
 
2
 
 
3
NOT RELEASED YET
 
4
----------------
 
5
 
 
6
  COMPATABILITY BREAKS:
 
7
 
 
8
  NEW FEATURES:
 
9
 
 
10
  IMPROVEMENTS:
 
11
 
 
12
  BUG FIXES:
 
13
 
 
14
  DOCUMENTATION:
 
15
 
 
16
  API CHANGES:
 
17
 
 
18
  TESTING:
 
19
 
 
20
  INTERNALS: