1
What's New in Bazaar 2.2?
2
=========================
4
This document outlines the major improvements in Bazaar 2.2
5
vs Bazaar 2.1. As well as summarizing improvements made to
6
the core product, it highlights enhancements within the broader
7
Bazaar world of potential interest to those upgrading.
11
Bazaar 2.2.0 is currently in development. While less stable than
12
Bazaar 2.1.x, we aim to keep quality at a high level:
14
* Monthly beta releases should be suitable for early adopters of new
17
* Nightly builds are suitable for users interested in assisting
20
If it doubt, please use the latest 2.1 release instead.
23
Improved conflict handling
24
--------------------------
26
Tree-shape conflicts can be resolved by providing ``--take-this`` and
27
``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
28
as resolved is still accessible via the ``--done`` default action.
31
Improved Launchpad integration
32
------------------------------
34
Merges can be proposed on Launchpad with the new **lp-propose-merge**
38
Notable plugin enhancements
39
---------------------------
47
Numerous improvements have been made to the developer documentation.
53
(Details coming soon.)
59
For more detailed information on the changes made, be sure to check
60
the :doc:`../release-notes/index` for:
62
* the interim bzr `milestones <https://launchpad.net/bzr/2.2>`_
63
* the plugins you use.
65
For a summary of changes made in earlier releases, see:
67
* :doc:`whats-new-in-2.1`
70
The Bazaar Development Team
added
removed
doc/en/whats-new/whats-new-in-2.2.txt
