19
* ``bzr commit`` accepts ``-p`` (for "patch") as a shorter name for
21
(Parth Malwankar, #571467)
23
* ``bzr ignore`` now supports a ``--default-rules`` option that displays
24
the default ignore rules used by bzr. The flag ``--old-default-rules``
25
is no longer supported by ``ignore``.
26
(Parth Malwankar, #538703)
19
* ``bzr diff`` now supports a --format option, which can be used to
20
select alternative diff formats. (Jelmer Vernooij, #555994)
28
22
* ``bzr pack`` now supports a ``--clean-obsolete-packs`` option that
29
23
can save disk space by deleting obsolete pack files created during the
36
* ``.bazaar``, ``.bazaar/bazaar.conf`` and ``.bzr.log`` inherit user and
37
group ownership from the containing directory. This allow bzr to work
39
(Martin <gzlist@googlemail.com>, Parth Malwankar, #376388)
41
* ``bzr log --exclude-common-ancestry -r X..Y`` displays the revisions that
42
are part of Y ancestry but not part of X ancestry (aka the graph
44
(Vincent Ladeuil, #320119)
46
* ``bzr selftest --parallel=fork`` wait for its children avoiding zombies.
47
(Vincent Ladeuil, #566670)
49
* ``bzr selftest`` should not use ui.note() since it's not unicode safe.
50
(Vincent Ladeuil, #563997)
52
* Don't mention --no-strict when we just issue the warning about unclean trees.
53
(Vincent Ladeuil, #401599)
55
* Fixed ``AssertionError`` when accessing smart servers running Bazaar
57
(Andrew Bennetts, #528041)
59
* Reduce peak memory by one copy of compressed text.
60
(John Arbash Meinel, #566940)
62
* Show the filenames when a file rename fails so that the error will be
64
(Martin Pool, #491763)
69
* ``append_revisions_only`` will now be interpreted as a boolean and a
70
warning emitted if illegal values are used. Note that for projects
71
that needs to maintain compatibility with previsous bzr versions,
72
only 'True' and 'False' strings must be used (previous versions of
73
bzr will interpret all strings differing from 'True'
74
(case-sensitive) as false.
75
(Brian de Alwis, Vincent Ladeuil)
77
* ``Config.get_user_option_as_bool`` will now warn if a value cannot
78
be interpreted as a boolean.
87
* Added ``bzrlib.merge.PerFileMerger``, a more convenient way to write
88
some kinds of ``merge_file_content`` hook functions.
91
* `BzrDir`, `Branch`, `Repository` and `WorkingTree` now all support `user_url`,
92
`user_transport`, `control_url` and `control_transport` members pointing
93
respectively to the directory containing the ``.bzr`` control directory,
94
and to the directory within ``.bzr`` used for the particular component.
95
All of them inherit from `ControlComponent` which provides default
102
* ``_remember_remote_is_before`` no longer raises AssertionError when
103
suboptimal network behaviour is noticed; instead it just mutters to the
104
log file (and warns the user if they have set the ``hpss`` debug flag).
105
This was causing unnecessary aborts for performance bugs that are minor
107
(Andrew Bennetts, #528041)
109
* Permit bzr to run under ``python -OO`` which reduces the size of bytecode
110
files loaded from disk. To ensure docstrings needed for help are never
111
stripped, the prefix ``__doc__ =`` should now be used.
112
(Martin <gzlist@googlemail.com>)
117
* ``bzr selftest --parallel=subprocess`` now works correctly on win32.
118
(Gordon Tyler, #551332)
120
* Workaround ``Crypto.Random`` check leading to spurious test
121
failures on Lucid, FreeBSD and gentoo.
122
(Vincent Ladeuil, #528436)
129
This is a somewhat early second beta of the 2.2 series, to fix a python2.4
130
incompatibility in the 2.2b1 release. It also includes a swag of
131
performance, usability and correctness improvements: test feedback on all
132
of these would be welcome.
138
* ``bzr diff`` now supports a --format option, which can be used to
139
select alternative diff formats. (Jelmer Vernooij, #555994)
144
30
* ``bzr dpush``, ``bzr push`` and ``bzr send`` will now issue a warning
145
31
instead of failing when dirty trees are involved. The corresponding
146
32
``dpush_strict``, ``push_strict`` and ``send_strict`` should be set to
152
38
http://bugs.python.org/issue8396 .
153
39
(Parth Malwankar, #413406)
155
* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
156
(Aaron Bentley, #559436)
158
41
* ``bzr update`` when a pending merge in the working tree has been merged
159
42
into the master branch will no longer claim that old commits have become
160
43
pending merges. (Robert Collins, #562079)
45
* ``bzr selftest --parallel=fork`` wait for its children avoiding zombies.
46
(Vincent Ladeuil, #566670)
162
48
* ``bzrlib.mutabletree.MutableTree.commit`` will now support a passed in
163
49
config as in previous versions of bzrlib. (Robert Collins)
51
* ``bzr selftest`` should not use ui.note() since it's not unicode safe.
52
(Vincent Ladeuil, #563997)
165
54
* Fix glitch in the warning about unclean trees display.
166
55
(Vincent Ladeuil, #562665)
168
* Fixed Python2.4 incompatibilities in the bzr2.2b1 source tarball.
171
57
* Help messages generated by ``RegistryOption.from_kwargs`` list the
172
58
switches in alphabetical order, rather than in an undefined order.
173
59
(Martin von Gagern, #559409)
177
63
which is not installed any more" error.
178
64
(Martin Pool, James Westby, #528114)
66
* Repositories accessed via a smart server now reject being stacked on a
67
repository in an incompatible format, as is the case when accessing them
68
via other methods. This was causing fetches from those repositories via
69
a smart server (e.g. using ``bzr branch``) to receive invalid data.
70
(Andrew Bennetts, #562380)
180
72
* Reset ``siginterrupt`` flag to False every time we handle a signal
181
73
installed with ``set_signal_handler(..., restart_syscall=True)`` (from
182
74
``bzrlib.osutils``. Reduces the likelihood of "Interrupted System Call"
523
425
happens, and another warning will be written if the log file could not
524
426
be closed after retrying 100 times. (Andrew Bennetts, #531746)
529
:2.1.2: NOT RELEASED YET
534
* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
535
(Aaron Bentley, #559436)
537
* Fixed ``AssertionError`` when accessing smart servers running Bazaar
539
(Andrew Bennetts, #528041)
541
* Reset ``siginterrupt`` flag to False every time we handle a signal
542
installed with ``set_signal_handler(..., restart_syscall=True)`` (from
543
``bzrlib.osutils``. Reduces the likelihood of "Interrupted System Call"
544
errors after two window resizes.
550
* ``_remember_remote_is_before`` no longer raises AssertionError when
551
suboptimal network behaviour is noticed; instead it just mutters to the
552
log file (and warns the user if they have set the ``hpss`` debug flag).
553
This was causing unnecessary aborts for performance bugs that are minor
555
(Andrew Bennetts, #528041)
848
* ``bzr revert`` now only takes write lock on working tree, instead of on
849
both working tree and branch.
850
(Danny van Heumen, #498409)
852
* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
853
permissions as ``.bzr`` directory on a POSIX OS.
854
(Parth Malwankar, #262450)
984
856
* Additional merges after an unrelated branch has been merged with its
985
857
history no longer crash when deleted files are involved.
986
858
(Vincent Ladeuil, John Arbash Meinel, #375898)
988
* ``bzr revert`` now only takes write lock on working tree, instead of on
989
both working tree and branch.
990
(Danny van Heumen, #498409)
992
* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
993
permissions as ``.bzr`` directory on a POSIX OS.
994
(Parth Malwankar, #262450)
996
* Repositories accessed via a smart server now reject being stacked on a
997
repository in an incompatible format, as is the case when accessing them
998
via other methods. This was causing fetches from those repositories via
999
a smart server (e.g. using ``bzr branch``) to receive invalid data.
1000
(Andrew Bennetts, #562380)