~bzr-pqm/bzr/bzr.dev

Viewing changes to NEWS

Committer: Canonical.com Patch Queue Manager
Date: 2010-01-29 10:01:24 UTC
mfrom: (4797.6.2 2.1.0rc1-dev)
mto: (4988.1.2 jam-integration) (4797.10.1 2.1) (4996.2.1 integration) (4999.1.1 integration) (5016.1.1 integration) (5031.1.2 merge-2.1-into-devel) (5036.1.1 integration) (4763.2.4 jam-integration) (5053.1.1 integration) (5068.1.1 integration) (5074.1.1 integration) (5080.2.1 merge-2.1-into-devel) (5110.1.1 integration) (5050.4.1 2.2) (5159.1.1 integration) (5197.1.1 merge-2.1-into-devel) (5241.2.1 trunk) (5258.1.1 diff-header-encoding) (5244.1.1 trunk) (5263.1.1 trunk) (5297.1.1 integration) (5609.33.5 2.3) (6015.55.2 2.4-feature-flags)
mto: This revision was merged to the branch mainline in revision 4989.
Revision ID: pqm@pqm.ubuntu.com-20100129100124-va4vnmro5vyjfods

(jam) update to a real 2.1.0rc2 release

added added

removed removed

.. contents:: List of Releases

:depth: 1

bzr 2.1.0rc2 (not released yet)

###############################

bzr 2.1.0rc2

############

:Codename: after the bubbles

:2.1.0rc2: 2010-01-29

This is a quick-turn-around to update a small issue with our new per-file

merge hook. We expect no major changes from this to the final 2.1.0.

API Changes

***********

helper class ``bzrlib.merge.ConfigurableFileMerger``.

(Robert Collins, John Arbash Meinel, #513822)

bzr 2.1.0rc1

############