60
66
content faster than seeking and reading content from another tree,
61
67
especially in cold-cache situations. (John Arbash Meinel, #607298)
69
New revision specifiers
70
***********************
72
* The ``mainline`` revision specifier has been added. It takes another revision
73
spec as its input, and selects the revision which merged that revision into
76
For example, ``bzr log -vp -r mainline:1.2.3`` will show the log of the
77
revision that merged revision 1.2.3 into mainline, along with its status
78
output and diff. (Aaron Bentley)
80
* The ``annotate`` revision specifier has been added. It takes a path and a
81
line as its input (in the form ``path:line``), and selects the revision which
82
introduced that line of that file.
84
For example: ``bzr log -vp -r annotate:bzrlib/transform.py:500`` will select
85
the revision that introduced line 500 of transform.py, and display its log,
86
status output and diff.
88
It can be combined with ``mainline`` to select the revision that landed this
89
line into trunk, like so:
90
``bzr log -vp -r mainline:annotate:bzrlib/transform.py:500``
96
* Shell-like scripts can now be run directly from the command line without
97
writing a python test. This should help users adding reproducing recipes
98
to bug reports. (Vincent Ladeuil)
101
Improved conflict handling
102
**************************
104
* ``pull``, ``merge`` or ``switch`` can lead to conflicts when deleting a
105
versioned directory contains unversioned files. The cause of the conflict
106
is that deleting the directory will orphan the unversioned files so the
107
user needs to instruct ``bzr`` what do to do about these orpahns. This is
108
controlled by setting the ``bzr.transform.orphan_policy`` configuration
109
variable with a value of ``move``. In this case the unversioned files are
110
moved to a ``bzr-orphans`` directory at the root of the working tree. The
111
default behaviour is specified (if needed) by setting the variable to
112
``conflict``. (Vincent Ladeuil, #323111)
114
* ``bzr resolve`` now provides more feedback about the conflicts just
115
resolved and the remaining ones. (Vincent Ladeuil)
65
120
* A beta version of the documentation is now available in GNU TexInfo
66
121
format, used by emacs and the standalone ``info`` reader.
67
122
(Vincent Ladeuil, #219334)
127
``bzr`` can be configured via environment variables, command-line options
128
and configurations files. We've started working on unifying this and give
129
access to more options. The first step is a new ``bzr config`` command that
130
can be used to display the active configuration options in the current
131
working tree or branch as well as the ability to set or remove an
132
option. Scripts can also use it to get only the value for a given option.
134
Expected releases for the 2.3 series
135
************************************
137
The 2.3 series has entered the beta phase and 2.3.0 should be released soon
138
enough to be included into Natty Narwhal.
140
As a rough estimate, consider that 2.3.0 will be released in February
141
2011 and be supported until August 2012. Additional releases will be
142
made if critical bugs are encountered
70
145
Further information
71
146
*******************
added
removed
doc/en/whats-new/whats-new-in-2.3.txt
