16
* pull now takes --verbose to show you what revisions are added or removed
19
* merge now takes a --show-base option to include the base text in
23
* The config files are now read using ConfigObj, so '=' should be used as
27
* New 'bzr commit --strict' option refuses to commit if there are
28
any unknown files in the tree. To commit, make sure all files are
29
either ignored, added, or deleted. (Michael Ellerman)
31
* The config directory is now ~/.bazaar, and there is a single file
32
~/.bazaar/bazaar.conf storing email, editor and other preferences.
35
* 'bzr add' no longer takes a --verbose option, and a --quiet option
36
has been added that suppresses all output.
38
* Improved zsh completion support in contrib/zsh, from Clint
41
* Builtin 'bzr annotate' command, by Martin Pool with improvements from
44
* 'bzr check' now accepts -v for verbose reporting, and checks for
45
ghosts in the branch. (Robert Collins)
47
* New command 're-sign' which will regenerate the gpg signature for
48
a revision. (Robert Collins)
50
* If you set ``check_signatures=require`` for a path in
51
``~/.bazaar/branches.conf`` then bzr will invoke your
52
``gpg_signing_command`` (defaults to gpg) and record a digital signature
53
of your commit. (Robert Collins)
55
* New SFTP transport, based on Paramiko. (Robey Pointer)
57
* 'bzr pull' now accepts '--clobber' which will discard local changes
58
and make this branch identical to the source branch. (Robert Collins)
60
* Just give a quieter warning if a plugin can't be loaded, and
61
put the details in .bzr.log. (Martin Pool)
63
* 'bzr branch' will now set the branch-name to the last component of the
64
output directory, if one was supplied.
66
* If the option ``post_commit`` is set to one (or more) python function
67
names (must be in the bzrlib namespace), then they will be invoked
68
after the commit has completed, with the branch and ``revision_id`` as
69
parameters. (Robert Collins)
71
* Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
73
* --merge-type weave is now supported for file contents. Tree-shape
74
changes are still three-way based. (Martin Pool, Aaron Bentley)
76
* 'bzr check' allows the first revision on revision-history to have
77
parents - something that is expected for cheap checkouts, and occurs
78
when conversions from baz do not have all history. (Robert Collins).
80
* 'bzr merge' can now graft unrelated trees together, if your specify
81
0 as a base. (Aaron Bentley)
83
* 'bzr commit branch' and 'bzr commit branch/file1 branch/file2' now work
86
* Add '.sconsign*' to default ignore list. (Alexander Belchenko)
88
* 'bzr merge --reprocess' minimizes conflicts
93
* The 'bzr selftest --pattern' option for has been removed, now
94
test specifiers on the command line can be simple strings, or
95
regexps, or both. (Robert Collins)
97
* Passing -v to selftest will now show the time each test took to
98
complete, which will aid in analysing performance regressions and
99
related questions. (Robert Collins)
101
* 'bzr selftest' runs all tests, even if one fails, unless '--one'
102
is given. (Martin Pool)
104
* There is a new method for TestCaseInTempDir, assertFileEqual, which
105
will check that a given content is equal to the content of the named
106
file. (Robert Collins)
108
* Fix test suite's habit of leaving many temporary log files in $TMPDIR.
114
* New 'testament' command and concept for making gpg-signatures
115
of revisions that are not tied to a particular internal
116
representation. (Martin Pool).
118
* Per-revision properties ('revprops') as key-value associated
119
strings on each revision created when the revision is committed.
120
Intended mainly for the use of external tools. (Martin Pool).
122
* Config options have moved from bzrlib.osutils to bzrlib.config.
125
* Improved command line option definitions allowing explanations
126
for individual options, among other things. Contributed by
129
* Config options have moved from bzrlib.osutils to bzrlib.config.
130
Configuration is now done via the config.Config interface:
131
Depending on whether you have a Branch, a Location or no information
132
available, construct a ``*Config``, and use its ``signature_checking``,
133
``username`` and ``user_email`` methods. (Robert Collins)
135
* Plugins are now loaded under bzrlib.plugins, not bzrlib.plugin, and
136
they are made available for other plugins to use. You should not
137
import other plugins during the ``__init__`` of your plugin though, as
138
no ordering is guaranteed, and the plugins directory is not on the
139
python path. (Robert Collins)
141
* Branch.relpath has been moved to WorkingTree.relpath. WorkingTree no
142
no longer takes an inventory, rather it takes an option branch
143
parameter, and if None is given will open the branch at basedir
144
implicitly. (Robert Collins)
146
* Cleaner exception structure and error reporting. Suggested by
147
Scott James Remnant. (Martin Pool)
149
* Branch.remove has been moved to WorkingTree, which has also gained
150
``lock_read``, ``lock_write`` and ``unlock`` methods for convenience.
153
* Two decorators, ``needs_read_lock`` and ``needs_write_lock`` have been
154
added to the branch module. Use these to cause a function to run in a
155
read or write lock respectively. (Robert Collins)
157
* ``Branch.open_containing`` now returns a tuple (Branch, relative-path),
158
which allows direct access to the common case of 'get me this file
159
from its branch'. (Robert Collins)
161
* Transports can register using ``register_lazy_transport``, and they
162
will be loaded when first used. (Martin Pool)
164
* 'pull' has been factored out of the command as ``WorkingTree.pull()``.
165
A new option to WorkingTree.pull has been added, clobber, which will
166
ignore diverged history and pull anyway.
169
* config.Config has a ``get_user_option`` call that accepts an option name.
170
This will be looked up in branches.conf and bazaar.conf as normal.
171
It is intended that this be used by plugins to support options -
172
options of built in programs should have specific methods on the config.
175
* ``merge.merge_inner`` now has tempdir as an optional parameter.
178
* Tree.kind is not recorded at the top level of the hierarchy, as it was
179
missing on EmptyTree, leading to a bug with merge on EmptyTrees.
182
* ``WorkingTree.__del__`` has been removed, it was non deterministic and not
183
doing what it was intended to. See ``WorkingTree.__init__`` for a comment
184
about future directions. (Robert Collins/Martin Pool)
186
* bzrlib.transport.http has been modified so that only 404 urllib errors
187
are returned as NoSuchFile. Other exceptions will propagate as normal.
188
This allows debuging of actual errors. (Robert Collins)
190
* bzrlib.transport.Transport now accepts *ONLY* URL-escaped relative paths
191
to apis like 'put', 'get' and 'has'. This is to provide consistent
192
behaviour - it operates on URLs only. (Robert Collins)
194
* Transports can register using ``register_lazy_transport``, and they
195
will be loaded when first used. (Martin Pool)
197
* ``merge_flex`` no longer calls ``conflict_handler.finalize()``, instead that
198
is called by ``merge_inner``. This is so that the conflict count can be
199
retrieved (and potentially manipulated) before returning to the caller
200
of ``merge_inner``. Likewise 'merge' now returns the conflict count to the
201
caller. (Robert Collins)
203
* ``revision.revision_graph`` can handle having only partial history for
204
a revision - that is no revisions in the graph with no parents.
207
* New ``builtins.branch_files`` uses the standard ``file_list`` rules to
208
produce a branch and a list of paths, relative to that branch
211
* New TestCase.addCleanup facility.
213
* New ``bzrlib.version_info`` tuple (similar to ``sys.version_info``),
214
which can be used by programs importing bzrlib.
219
* Better handling of branches in directories with non-ascii names.
220
(Joel Rosdahl, Panagiotis Papadakos)
222
* Upgrades of trees with no commits will not fail due to accessing
223
[-1] in the revision-history. (Andres Salomon)
227
vim: tw=74 ft=rst ff=unix
added
removed
doc/en/release-notes/bzr-0.6.txt
