17
17
2.1, and 2.2, and can read and write repositories generated by all
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)
30
* The default ``ignore`` file created by Bazaar will contain ``__pycache__``,
31
which is the name of the directory that will be used by Python to store
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)
20
48
Launchpad integration
21
49
*********************
32
66
with many changes by not repeatedly building a list of all file-ids.
35
* ``bzr send`` uses less memory.
69
* ``bzr send`` uses less memory.
36
70
(John Arbash Meinel, #614576)
72
* Fetches involving stacked branches and branches with tags now do slightly less
73
I/O, and so does branching from an existing branch. This also improves the
74
network performance of these operations. (Andrew Bennetts)
38
76
* Inventory entries now consume less memory (on 32-bit Ubuntu file entries
39
77
have dropped from 68 bytes to 40, and directory entries from 120 bytes
40
78
to 48). This affects most operations, and depending on the size of the
52
90
content faster than seeking and reading content from another tree,
53
91
especially in cold-cache situations. (John Arbash Meinel, #607298)
93
New revision specifiers
94
***********************
96
* The ``mainline`` revision specifier has been added. It takes another revision
97
spec as its input, and selects the revision which merged that revision into
100
For example, ``bzr log -vp -r mainline:1.2.3`` will show the log of the
101
revision that merged revision 1.2.3 into mainline, along with its status
102
output and diff. (Aaron Bentley)
104
* The ``annotate`` revision specifier has been added. It takes a path and a
105
line as its input (in the form ``path:line``), and selects the revision which
106
introduced that line of that file.
108
For example: ``bzr log -vp -r annotate:bzrlib/transform.py:500`` will select
109
the revision that introduced line 500 of transform.py, and display its log,
110
status output and diff.
112
It can be combined with ``mainline`` to select the revision that landed this
113
line into trunk, like so:
114
``bzr log -vp -r mainline:annotate:bzrlib/transform.py:500``
117
Testing/Bug reporting
118
*********************
120
* Shell-like scripts can now be run directly from the command line without
121
writing a python test. This should help users adding reproducing recipes
122
to bug reports. (Vincent Ladeuil)
125
Improved conflict handling
126
**************************
128
* ``pull``, ``merge`` or ``switch`` can lead to conflicts when deleting a
129
versioned directory contains unversioned files. The cause of the conflict
130
is that deleting the directory will orphan the unversioned files so the
131
user needs to instruct ``bzr`` what do to do about these orpahns. This is
132
controlled by setting the ``bzr.transform.orphan_policy`` configuration
133
variable with a value of ``move``. In this case the unversioned files are
134
moved to a ``bzr-orphans`` directory at the root of the working tree. The
135
default behaviour is specified (if needed) by setting the variable to
136
``conflict``. (Vincent Ladeuil, #323111)
138
* ``bzr resolve --take-this`` and ``bzr resolve --take-other`` can now be
139
used for text conflicts. This will ignore the differences that were merged
140
cleanly and replace the file with its content in the current branch
141
(``--take-this``) or with its content in the merged branch
142
(``--take-other``). (Vincent Ladeuil, #638451)
144
* ``bzr resolve`` now provides more feedback about the conflicts just
145
resolved and the remaining ones. (Vincent Ladeuil)
57
150
* A beta version of the documentation is now available in GNU TexInfo
58
151
format, used by emacs and the standalone ``info`` reader.
59
152
(Vincent Ladeuil, #219334)
157
``bzr`` can be configured via environment variables, command-line options
158
and configurations files. We've started working on unifying this and give
159
access to more options. The first step is a new ``bzr config`` command that
160
can be used to display the active configuration options in the current
161
working tree or branch as well as the ability to set or remove an
162
option. Scripts can also use it to get only the value for a given option.
164
Expected releases for the 2.3 series
165
************************************
167
The 2.3 series has entered the beta phase and 2.3.0 should be released soon
168
enough to be included into Natty Narwhal.
170
As a rough estimate, consider that 2.3.0 will be released in February
171
2011 and be supported until August 2012. Additional releases will be
172
made if critical bugs are encountered
62
175
Further information
63
176
*******************
added
removed
doc/en/whats-new/whats-new-in-2.3.txt
