23
* Support for some old development formats have been removed:
24
``development-rich-root``, ``development6-rich-root``, and
25
``development7-rich-root``. These formats were always labelled experimental
26
and not used unless the user specifically asked for them. If you have
27
repositories using these old formats you should upgrade them to ``2a`` using
28
Bazaar 2.2. (Andrew Bennetts)
23
30
* The default ``ignore`` file created by Bazaar will contain ``__pycache__``,
24
31
which is the name of the directory that will be used by Python to store
26
33
(Andrea Corbellini, #626687)
35
* The default sort order for the ``bzr tags`` command now uses a natural sort
36
where numeric substrings are sorted numerically. The previous default was
37
"asciibetical" where tags were sorted by the characters they contained. To
38
get the old behavior, one can use ``bzr tags --sort=alpha``.
39
(Neil Martinsen-Burrell, #640760)
41
* On platforms other than Windows and Mac OS X, Bazaar will use configuration
42
files that live in $XDG_CONFIG_HOME/bazaar if that directory exists. This
43
allows interested individuals to conform to the XDG Base Directory
44
specification. The plugin location has not changed and is still
45
~/.bazaar/plugins. To use a different directory for plugins, use the
46
environment variable BZR_PLUGIN_PATH. (Neil Martinsen-Burrell, #195397)
48
* ``bzr upgrade`` now operates recursively when run on a shared
49
repository, automatically upgrading the branches within it, and has
50
grown additional options for showing what it will do and cleaning up
51
after itself. (Ian Clatworthy, Matthew Fuller, #89830, #374734, #422450)
28
53
Launchpad integration
29
54
*********************
33
58
``bzr launchpad-login user && bzr push lp:~/project/branch`` will now
34
59
push to ``lp:~user/project/branch``. (John Arbash Meinel)
61
* Launchpad has announced that the ``edge.launchpad.net`` instance is
62
deprecated and may be shut down in the future
63
<http://blog.launchpad.net/general/edge-is-deprecated>. Bazaar has therefore
64
been updated in this release to talk to the main (``launchpad.net``) servers,
65
rather than the ``edge`` ones.
36
67
Performance improvements
37
68
************************
43
74
* ``bzr send`` uses less memory.
44
75
(John Arbash Meinel, #614576)
77
* Fetches involving stacked branches and branches with tags now do slightly less
78
I/O, and so does branching from an existing branch. This also improves the
79
network performance of these operations. (Andrew Bennetts)
46
81
* Inventory entries now consume less memory (on 32-bit Ubuntu file entries
47
82
have dropped from 68 bytes to 40, and directory entries from 120 bytes
48
83
to 48). This affects most operations, and depending on the size of the
84
119
``bzr log -vp -r mainline:annotate:bzrlib/transform.py:500``
122
Testing/Bug reporting
123
*********************
125
* Shell-like scripts can now be run directly from the command line without
126
writing a python test. This should help users adding reproducing recipes
127
to bug reports. (Vincent Ladeuil)
130
Improved conflict handling
131
**************************
133
* ``pull``, ``merge`` or ``switch`` can lead to conflicts when deleting a
134
versioned directory contains unversioned files. The cause of the conflict
135
is that deleting the directory will orphan the unversioned files so the
136
user needs to instruct ``bzr`` what do to do about these orpahns. This is
137
controlled by setting the ``bzr.transform.orphan_policy`` configuration
138
variable with a value of ``move``. In this case the unversioned files are
139
moved to a ``bzr-orphans`` directory at the root of the working tree. The
140
default behaviour is specified (if needed) by setting the variable to
141
``conflict``. (Vincent Ladeuil, #323111)
143
* ``bzr resolve --take-this`` and ``bzr resolve --take-other`` can now be
144
used for text conflicts. This will ignore the differences that were merged
145
cleanly and replace the file with its content in the current branch
146
(``--take-this``) or with its content in the merged branch
147
(``--take-other``). (Vincent Ladeuil, #638451)
149
* ``bzr resolve`` now provides more feedback about the conflicts just
150
resolved and the remaining ones. (Vincent Ladeuil)
91
156
format, used by emacs and the standalone ``info`` reader.
92
157
(Vincent Ladeuil, #219334)
162
``bzr`` can be configured via environment variables, command-line options
163
and configurations files. We've started working on unifying this and give
164
access to more options. The first step is a new ``bzr config`` command that
165
can be used to display the active configuration options in the current
166
working tree or branch as well as the ability to set or remove an
167
option. Scripts can also use it to get only the value for a given option.
169
Expected releases for the 2.3 series
170
************************************
172
The 2.3 series has entered the beta phase and 2.3.0 should be released soon
173
enough to be included into Natty Narwhal.
175
As a rough estimate, consider that 2.3.0 will be released in February
176
2011 and be supported until August 2012. Additional releases will be
177
made if critical bugs are encountered
95
180
Further information
96
181
*******************
added
removed
doc/en/whats-new/whats-new-in-2.3.txt
