1
What's New in Bazaar 2.1?
2
=========================
4
This document outlines the major improvements in Bazaar 2.1
5
vs Bazaar 2.0. 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.
9
Bazaar 2.1.0 marks the start of our second long-term-stable series.
10
This series will be supported with bug fixes for the next 12 months.
11
All users are encouraged to upgrade from the 2.0.x stable series.
17
Many operations now consume less memory. Several operations are
18
also faster including branching, logging merged revisions and
19
upgrading from pre-2a to 2a format.
25
Several commands have new options. These include:
27
=========== ============== ======================================
28
Command Option Description
29
=========== ============== ======================================
30
branch bind Bind to the source location
31
commit commit-time Give an explicit commit timestamp
32
switch revision Switch to a particular revision
33
unshelve keep Apply changes but don't delete them
34
unshelve preview Show the diff that would result from
36
update revision Update to a particular revision
37
=========== ============== ======================================
39
Other command improvements include:
41
* A :doc:`../user-reference/shelve-help` editor can be defined to provide shelf functionality at
42
a granularity finer than per-patch hunk.
44
* :doc:`../user-reference/send-help` send now supports the OS X Mail application.
46
See the help for the commands above for further details.
52
Hooks can now be defined for smart merging of selected file types.
53
This enables easier merging of ChangeLogs, Release Notes and other
54
file that frequently conflict.
57
DWIM revision identifiers
58
-------------------------
60
Revision identifiers can now be given in a *Do-What-I-Mean* style.
61
For example, you can now just give a tag (instead of saying ``tag:xxx``)
62
or just say ``today`` (instead of saying ``date:today``). Prefixes
63
are now only required if the revision spec could be ambiguous.
69
Patterns prefixed with ``!`` are exceptions to ignore patterns and
70
take precedence over regular ignores. Such exceptions are used to
71
specify files that should be versioned which would otherwise be
72
ignored. Patterns prefixed with ``!!`` act as regular ignore patterns,
73
but have highest precedence, even over the ``!`` exception patterns.
76
Smart server home directory support
77
-----------------------------------
79
``bzr+ssh`` and ``bzr`` paths can now be relative to home directories
80
specified in the URL. Paths starting with a path segment of ``~`` are
81
relative to the home directory of the user running the server, and paths
82
starting with ``~user`` are relative to the home directory of the named
83
user. For example, for a user "bob" with a home directory of
84
``/home/bob``, these URLs are all equivalent:
86
* ``bzr+ssh://bob@host/~/repo``
87
* ``bzr+ssh://bob@host/~bob/repo``
88
* ``bzr+ssh://bob@host/home/bob/repo``
90
If ``bzr serve`` was invoked with a ``--directory`` argument, then no
91
home directories outside that directory will be accessible via this
94
This is a feature of ``bzr serve``, so pre-2.1 clients will
95
automatically benefit from this feature when ``bzr`` on the server is
99
Generalized glob support on Windows
100
-----------------------------------
102
On Windows, glob expansion is now handled in a universal way across
103
all commands. In previous versions, it was explicitly handed by just
104
a few commands, e.g. ``add``. A side effect of this change is that
105
patterns now need to be quoted when passed to the ``ignore`` command,
106
e.g. ``bzr ignore *.foo`` now needs to be given as ``bzr ignore "*.foo"``.
109
Improved Git and Mercurial interoperability
110
-------------------------------------------
112
Many improvements have been made to the git_ and hg_ plugins.
113
With these plugins installed, most Git and Mercurial repositories
114
can now be read by standard Bazaar clients. Changes can also
115
be written back via the dpush command.
117
.. _git: http://doc.bazaar.canonical.com/plugins/en/git-plugin.html
118
.. _hg: http://doc.bazaar.canonical.com/plugins/en/hg-plugin.html
124
New plugins are available for constructing larger projects
125
from smaller ones. These include:
127
* builder_ - construction of a branch using recipes
128
* externals_ - Subversion-style external branches
132
The builder plugin has been designed to complement the builddeb_
133
plugin to streamline Debian source package management. It may also
134
be useful for building test images for a QA team or disk images
137
.. _builder: http://doc.bazaar.canonical.com/plugins/en/builder-plugin.html
138
.. _externals: http://doc.bazaar.canonical.com/plugins/en/externals-plugin.html
139
.. _builddeb: http://doc.bazaar.canonical.com/plugins/en/builddeb-plugin.html
142
Colocated branch workspaces
143
---------------------------
145
A colocated workspace is one where a single working tree is used
146
across one or more branches managed at that same location. This
147
is now supported by the new colo_ plugin and by Bazaar Explorer.
149
.. _colo: http://doc.bazaar.canonical.com/plugins/en/colo-plugin.html
155
A :doc:`../admin-guide/index` covering topics such as setting up servers,
156
security, backups and email integration has been added.
158
A large number of documentation bugs have been fixed, clarifying
159
numerous issues and filling in some missing holes.
161
The :doc:`../user-reference/index`
162
has been organized into topics making it easier to
163
navigate through and print selected sections of.
165
To assist users migrating from other tools, a
166
`Survival Guide <http://doc.bazaar.canonical.com/migration/en/survival/index.html>`_
167
has been published explaining Bazaar to users of other tools in terms they
168
already know. Sections are provided for existing users of
169
CVS, Subversion, ClearCase, Perforce, Visual SourceSafe, Git, Mercurial,
172
Selected documents have also been translated to Japanese.
178
Numerous enhancements have been made to most of our GUIs including
179
Bazaar Explorer, TortoiseBZR and the QBzr-Eclipse add-on. These
180
applications all build on top of improvements made to QBzr. Bzr-gtk
181
has also been improved.
183
Bazaar Explorer has over a dozen new features including smart toolbars,
184
support for all bzr commands (including those in plugins),
185
a better working tree browser and a submit delta report showing the
186
cumulative effect of a series of commits.
187
See `What's New in Bazaar Explorer 1.0?
188
<http://doc.bazaar.canonical.com/explorer/en/whats-new/whats-new-in-1.0.html>`_
189
for more information.
195
For more detailed information on the changes made, be sure to check
196
the :doc:`../release-notes/index` for:
198
* the interim bzr `milestones <https://launchpad.net/bzr/2.1>`_
199
* the plugins you use.
202
The Bazaar Development Team