/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 NEWS

  • Committer: Aaron Bentley
  • Date: 2007-12-03 21:33:36 UTC
  • mto: This revision was merged to the branch mainline in revision 3073.
  • Revision ID: abentley@panoramicfeedback.com-20071203213336-tpv1ftv3kxpp8x08
Make _PlanMerge an implementation detail of _PlanMergeVersionedFile

Show diffs side-by-side

added added

removed removed

Lines of Context:
NEWS
279
279
 
280
280
   * InventoryEntry.diff is now deprecated.  Please use diff.DiffTree instead.
281
281
 
282
 
   * merge.PlanMerge is now provided to generate annotation-based merges
283
 
     cheaply on versionedfiles with no cheap annotations.
284
 
 
285
282
  TESTING:
286
283
 
287
284