6
* bzr-man.py has been updated to work again. Contributed by
9
* Locking is now done with fcntl.lockf which works with NFS
10
file systems. Contributed by Harald Meland.
12
* When a merge encounters a file that has been deleted on
13
one side and modified on the other, the old contents are
14
written out to foo.BASE and foo.SIDE, where SIDE is this
15
or OTHER. Contributed by Aaron Bentley.
17
* Export was choosing incorrect file paths for the content of
18
the tarball, this has been fixed by Aaron Bentley.
20
* Commit will no longer commit without a log message, an
21
error is returned instead. Contributed by Jelmer Vernooij.
23
* If you commit a specific file in a sub directory, any of its
24
parent directories that are added but not listed will be
25
automatically included. Suggested by Michael Ellerman.
27
* bzr commit and upgrade did not correctly record new revisions
28
for files with only a change to their executable status.
29
bzr will correct this when it encounters it. Fixed by
32
* HTTP tests now force off the use of http_proxy for the duration.
33
Contributed by Gustavo Niemeyer.
38
* 'branch' now accepts a --basis parameter which will take advantage
39
of local history when making a new branch. This allows faster
40
branching of remote branches. Contributed by Aaron Bentley.
42
* New tree format based on weave files, called version 5.
43
Existing branches can be upgraded to this format using
46
* Symlinks are now versionable. Initial patch by
47
Erik Toubro Nielsen, updated to head by Robert Collins.
49
* Executable bits are tracked on files. Patch from Gustavo
52
* 'bzr status' now shows unknown files inside a selected directory.
53
Patch from Heikki Paajanen.
55
* Merge conflicts are recorded in .bzr. Two new commands 'conflicts'
56
and 'resolve' have needed added, which list and remove those
57
merge conflicts respectively. A conflicted tree cannot be committed
58
in. Contributed by Aaron Bentley.
60
* 'rm' is now an alias for 'remove'.
65
* Test case failures have the exception printed after the log
66
for your viewing pleasure.
68
* InventoryEntry is now an abstract base class, use one of the
69
concrete InventoryDirectory etc classes instead.
71
* Branch raises an UnsupportedFormatError when it detects a
72
bzr branch it cannot understand. This allows for precise
73
handling of such circumstances.
78
* Removed testsweet module so that tests can be run after
79
bzr installed by 'bzr selftest'.
81
* 'bzr selftest' command-line arguments can now be partial ids
82
of tests to run, e.g. 'bzr selftest test_weave'
89
* Fixed "branch -r" option.
91
* Fix remote access to branches containing non-compressed history.
94
* Better reliability of http server tests. (John Arbash-Meinel)
96
* Merge graph maximum distance calculation fix. (Aaron Bentley)
98
* Various minor bug in windows support have been fixed, largely in the
99
test suite. Contributed by Alexander Belchenko.
103
* Status now accepts a -r argument to give status between chosen
104
revisions. Contributed by Heikki Paajanen.
106
* Revision arguments no longer use +/-/= to control ranges, instead
107
there is a 'before' namespace, which limits the successive namespace.
108
For example '$ bzr log -r date:yesterday..before:date:today' will
109
select everything from yesterday and before today. Contributed by
112
* There is now a bzr.bat file created by distutils when building on
113
Windows. Contributed by Alexander Belchenko.
117
* Removed uuid() as it was unused.
119
* Improved 'fetch' code for pulling revisions from one branch into
120
another (used by pull, merged, etc.)
127
* Adding a file whose parent directory is not versioned will
128
implicitly add the parent, and so on up to the root. This means
129
you should never need to explictly add a directory, they'll just
130
get added when you add a file in the directory. Contributed by
133
* Ignore .DS_Store (contains Mac metadata) by default. Patch from
136
* If you set BZR_EDITOR in the environment, it is checked in
137
preference to EDITOR and the config file for the interactive commit
138
editing program. Related to this is a bugfix where a missing program
139
set in EDITOR would cause editing to fail, now the fallback program
140
for the operating system is still tried.
142
* Files that are not directories/symlinks/regular files will no longer
143
cause bzr to fail, it will just ignore them by default. You cannot add
144
them to the tree though - they are not versionable.
149
* Refactor xml packing/unpacking.
153
* Fixed 'bzr mv' by Ollie Rutherfurd.
155
* Fixed strange error when trying to access a nonexistent http
158
* Make sure that the hashcache gets written out if it can't be
164
* Various Windows fixes from Ollie Rutherfurd.
166
* Quieten warnings about locking; patch from Matt Lavin.
173
* ``bzr shell-complete`` command contributed by Clint Adams to
174
help with intelligent shell completion.
176
* New expert command ``bzr find-merge-base`` for debugging merges.
181
* Much better merge support.
183
* merge3 conflicts are now reported with markers like '<<<<<<<'
184
(seven characters) which is the same as CVS and pleases things
190
* ``bzr upgrade`` no longer fails when trying to fix trees that
191
mention revisions that are not present.
193
* Fixed bugs in listing plugins from ``bzr plugins``.
195
* Fix case of $EDITOR containing options for the editor.
197
* Fix log -r refusing to show the last revision.
198
(Patch from Goffredo Baroncelli.)
203
* ``bzr log --show-ids`` shows the revision ids of all parents.
205
* Externally provided commands on your $BZRPATH no longer need
206
to recognize --bzr-usage to work properly, and can just handle
212
* Changed trace messages to go through the standard logging
213
framework, so that they can more easily be redirected by
18
235
* ``bzr mv`` does move or rename depending on its arguments, like
238
* ``bzr missing`` command shows a summary of the differences
239
between two trees. (Merged from John Arbash-Meinel.)
241
* An email address for commits to a particular tree can be
242
specified by putting it into .bzr/email within a branch. (Based
243
on a patch from Heikki Paajanen.)
23
248
* Faster working tree operations.
253
* 3rd-party modules shipped with bzr are copied within the bzrlib
254
python package, so that they can be installed by the setup
255
script without clashing with anything already existing on the
256
system. (Contributed by Gustavo Niemeyer.)
258
* Moved plugins directory to bzrlib/, so that there's a standard
259
plugin directory which is not only installed with bzr itself but
260
is also available when using bzr from the development tree.
261
BZR_PLUGIN_PATH and DEFAULT_PLUGIN_PATH are then added to the
262
standard plugins directory.
27
264
* When exporting to a tarball with ``bzr export --format tgz``, put
28
265
everything under a top directory rather than dumping it into the
29
266
current directory. This can be overridden with the ``--root``