5
5
.. contents:: List of Releases
11
:2.2b3: NOT RELEASED YET
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)
28
* ``bzr pack`` now supports a ``--clean-obsolete-packs`` option that
29
can save disk space by deleting obsolete pack files created during the
31
(Parth Malwankar, #304320)
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
* Added ``bzrlib.tests.matchers`` as a place to put matchers, along with
118
our first in-tree matcher. See the module docstring for details.
121
* ``bzr selftest --parallel=subprocess`` now works correctly on win32.
122
(Gordon Tyler, #551332)
124
* Workaround ``Crypto.Random`` check leading to spurious test
125
failures on Lucid, FreeBSD and gentoo.
126
(Vincent Ladeuil, #528436)
133
This is a somewhat early second beta of the 2.2 series, to fix a python2.4
134
incompatibility in the 2.2b1 release. It also includes a swag of
135
performance, usability and correctness improvements: test feedback on all
136
of these would be welcome.
142
* ``bzr diff`` now supports a --format option, which can be used to
143
select alternative diff formats. (Jelmer Vernooij, #555994)
148
* ``bzr dpush``, ``bzr push`` and ``bzr send`` will now issue a warning
149
instead of failing when dirty trees are involved. The corresponding
150
``dpush_strict``, ``push_strict`` and ``send_strict`` should be set to
151
True explicitly to get the previous behaviour.
152
(Vincent Ladeuil, #519319)
154
* ``bzr export`` to tar file does not fail if any parent directory
155
contains unicode characters. This works around upstream Python bug
156
http://bugs.python.org/issue8396 .
157
(Parth Malwankar, #413406)
159
* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
160
(Aaron Bentley, #559436)
162
* ``bzr update`` when a pending merge in the working tree has been merged
163
into the master branch will no longer claim that old commits have become
164
pending merges. (Robert Collins, #562079)
166
* ``bzrlib.mutabletree.MutableTree.commit`` will now support a passed in
167
config as in previous versions of bzrlib. (Robert Collins)
169
* Fix glitch in the warning about unclean trees display.
170
(Vincent Ladeuil, #562665)
172
* Fixed Python2.4 incompatibilities in the bzr2.2b1 source tarball.
175
* Help messages generated by ``RegistryOption.from_kwargs`` list the
176
switches in alphabetical order, rather than in an undefined order.
177
(Martin von Gagern, #559409)
179
* Make sure the ``ExecutablePath`` and ``InterpreterPath`` are set in
180
Apport crash reports, to avoid "This problem report applies to a program
181
which is not installed any more" error.
182
(Martin Pool, James Westby, #528114)
184
* Reset ``siginterrupt`` flag to False every time we handle a signal
185
installed with ``set_signal_handler(..., restart_syscall=True)`` (from
186
``bzrlib.osutils``. Reduces the likelihood of "Interrupted System Call"
187
errors after two window resizes.
190
* When invoked with a range revision, ``bzr log`` doesn't show revisions
191
that are not part of the Y revisions ancestry anymore when invoked with
193
(Vincent Ladeuil, #474807)
195
* Properly handle ``param_name`` attribute for ``ListOption``.
196
(Martin von Gagern, 387117)
201
* ``bzr commit`` will prompt before using a commit message that was
202
generated by a template and not edited by the user.
203
(Robert Collins, #530265)
205
* ``bzr diff`` read-locks the trees and branches only once, saving about
206
10-20ms on ``bzr diff`` in a bzr.dev tree.
209
* ``bzr missing`` read-locks the branches only once.
212
* ``bzr pull`` locks the branches and tree only once.
215
* Index lookups in pack repositories search recently hit pack files first.
216
In repositories with many pack files this can greatly reduce the
217
number of files accessed, the number of bytes read, and the number of
218
read calls. An incremental pull via plain HTTP takes half the time and
219
bytes for a moderately large repository. (Andrew Bennetts)
221
* Index lookups only re-order the indexes when the hit files aren't
222
already first. Reduces the cost of reordering
223
(John Arbash Meinel, #562429)
225
* Less code is loaded at startup. (Cold-cache start time is about 10-20%
227
(Martin Pool, #553017)
232
* ``bzrlib.diff.get_trees_and_branches_to_diff`` is deprecated. Use
233
``get_trees_and_branches_to_diff_locked`` instead.
239
* ``bzrlib.commands.Command.run_direct`` is no longer needed - the pre
240
2.1 method of calling run() to perform testing or direct use via the API
241
is now possible again. As part of this, the _operation attribute on
242
Command is now transient and only exists for the duration of ``run()``.
253
* BTreeGraphIndex can now take an offset to indicate that the data starts
254
somewhere other than then beginning of the file. (John Arbash Meinel)
256
* Deleted very old hidden commands ``versionedfile-list``,
257
``weave-plan-merge``, ``weave-merge-text``.
260
* ``Repository.get_inventory_sha1()`` and ``Repository.get_revision_xml()``
261
have been removed. (Jelmer Vernooij)
263
* ``Repository.get_revision_inventory()`` has been removed in favor of
264
``Repository.get_inventory()``. (Jelmer Vernooij)
266
* All test servers have been moved out of the bzrlib.transport hierarchy to
267
bzrlib.tests.test_server *except* for MemoryServer, ChrootServer and
268
PathFilteringServer. ``bzrlib`` users may encounter test failures that can
269
be fixed by updating the related imports from ``bzrlib.transport.xxx`` to
270
``bzrlib.tests.test_server``.
273
* ``BranchReferenceFormat.initialize()`` now takes an optional name argument
274
as its second parameter, for consistency with the initialize() method of
275
other formats. (Jelmer Vernooij)
280
* Added ``bzr remove-branch`` command that can remove a local or remote
281
branch. (Jelmer Vernooij, #276295)
283
* ``bzr export`` now takes an optional argument ``--per-file-timestamps``
284
to set file mtimes to the last timestamp of the last revision in which
285
they were changed rather than the current time. (Jelmer Vernooij)
287
* If the Apport crash-reporting tool is available, bzr crashes are now
288
stored into the ``/var/crash`` apport spool directory, and the user is
289
invited to report them to the developers from there, either
290
automatically or by running ``apport-bug``. No information is sent
291
without specific permission from the user. (Martin Pool, #515052)
293
* Parsing of command lines, for example in ``diff --using``, no longer
294
treats backslash as an escape character on Windows. (Gordon Tyler,
297
* Plugins can be disabled by defining ``BZR_DISABLE_PLUGINS`` as
298
a list of plugin names separated by ':' (';' on windows).
299
(Vincent Ladeuil, #411413)
301
* Plugins can be loaded from arbitrary locations by defining
302
``BZR_PLUGINS_AT`` as a list of name@path separated by ':' (';' on
303
windows). This takes precedence over ``BZR_PLUGIN_PATH`` for the
304
specified plugins. This is targeted at plugin developers for punctual
305
needs and *not* intended to replace ``BZR_PLUGIN_PATH``.
306
(Vincent Ladeuil, #82693)
308
* Tag names can now be determined automatically by ``automatic_tag_name``
309
hooks on ``Branch`` if they are not specified on the command line.
312
* Tree-shape conflicts can be resolved by providing ``--take-this`` and
313
``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
314
as resolved is still accessible via the ``--done`` default action.
317
* Merges can be proposed on Launchpad with the new lp-propose-merge command.
318
(Aaron Bentley, Jonathan Lange)
323
* Added docstring for ``Tree.iter_changes``
324
(John Arbash Meinel, #304182)
326
* Allow additional arguments to
327
``RemoteRepository.add_inventory_by_delta()``. (Jelmer Vernooij, #532631)
329
* Allow exporting a single file using ``bzr export``.
330
(Michal Junák, #511987)
332
* Allow syscalls to automatically restart when ``TextUIFactory``'s
333
SIGWINCH handler is invoked, avoiding ``EINTR`` errors during blocking
334
IO, which are often poorly handled by Python's libraries and parts of
335
bzrlib. (Andrew Bennetts, #496813)
337
* Avoid infinite recursion when probing for apport.
338
(Vincent Ladeuil, #516934)
340
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
341
(Martin Pool, #331095)
343
* Avoid truncating svn URLs.
344
(Martin Pool, Martin von Gagern, #545185)
346
* ``bzr add`` will not add conflict related files unless explicitly required.
347
(Vincent Ladeuil, #322767, #414589)
349
* ``bzr dump-btree`` now works on ``*.cix`` and ``*.six`` files. Those
350
indices do not have reference lists, so ``dump-btree`` will simply show
351
``None`` instead. (Andrew Bennetts, #488607)
353
* ``bzr help`` will no longer trigger the get_missing_command hook when
354
doing a topic lookup. This avoids prompting (like 'no command plugins/loom,
355
did you mean log?') when getting help. In future we may trigger the hook
356
deliberately when no help topics match from any help index.
357
(Robert Collins, #396261)
359
* ``bzr log -n0 -r..A.B.C`` should not crash but just consider the None
360
revspec as representing the first revision of the branch.
361
(Vincent Ladeuil, #519862)
363
* ``bzr remove-tree`` can now remove multiple working trees.
364
(Jared Hance, Andrew Bennetts, #253137)
366
* ``bzr resolve --take-this`` and ``--take-other`` now correctly renames
367
the kept file on content conflicts where one side deleted the file.
368
(Vincent Ladeuil, #529968)
370
* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
371
permissions as ``.bzr`` directory on a POSIX OS.
372
(Parth Malwankar, #262450)
374
* ``bzr upgrade`` now names backup directory as ``backup.bzr.~N~`` instead
375
of ``backup.bzr``. This directory is ignored by bzr commands such as
377
(Parth Malwankar, #335033, #300001)
379
* Cope with non-utf8 characters inside ``.bzrignore``.
380
(Jason Spashett, #183504)
382
* Correctly interpret "451 Rename/move failure: Directory not empty" from
383
ftp servers while trying to take a lock.
384
(Martin Pool, #528722)
386
* DirStateRevisionTree.kind() was returning wrong result when 'kind'
387
changes occured between the workingtree and one of its parents.
388
(Vincent Ladeuil, #535547)
390
* Fix ``log`` to better check ancestors even if merged revisions are involved.
391
(Vincent Ladeuil, #476293)
393
* Loading a plugin from a given path with ``BZR_PLUGINS_AT`` doesn't depend
394
on os.lisdir() order and is now reliable.
395
(Vincent Ladeuil, #552922).
397
* Many IO operations that returned ``EINTR`` were retried even if it
398
wasn't safe to do so via careless use of ``until_no_eintr``. Bazaar now
399
only retries operations that are safe to retry, and in some cases has
400
switched to operations that can be retried (e.g. ``sock.send`` rather than
402
(Andrew Bennetts, Martin <gzlist@googlemail.com>, #496813)
404
* Path conflicts now support --take-this and --take-other even when a
405
deletion is involved.
406
(Vincent Ladeuil, #531967)
408
* Network transfer amounts and rates are now displayed in SI units according
409
to the Ubuntu Units Policy <https://wiki.ubuntu.com/UnitsPolicy>.
410
(Gordon Tyler, #514399)
412
* Support kind markers for socket and fifo filesystem objects. This
413
prevents ``bzr status --short`` from crashing when those files are
414
present. (John Arbash Meinel, #303275)
416
* ``bzr mkdir DIR`` will not create DIR unless DIR's parent is a versioned
417
directory. (Parth Malwankar, #138600)
419
* SSH child processes will now ignore SIGQUIT on nix systems so breaking into
420
the debugger won't kill the session.
421
(Martin <gzlist@googlemail.com>, #162502)
423
* Tolerate patches with leading noise in ``bzr-handle-patch``.
424
(Toshio Kuratomi, Martin Pool, #502076)
426
* ``update -r`` now supports updating to revisions that are not on
427
mainline (i.e. it supports dotted revisions).
428
(Parth Malwankar, #517800)
430
* Use first apparent author not committer in GNU Changelog format.
431
(Martin von Gagern, #513322)
436
* ``bzrlib.merge_directive._BaseMergeDirective`` has been renamed to
437
``bzrlib.merge_directive.BaseMergeDirective`` and is now public.
440
* ``BranchFormat.initialize`` now takes an optional ``name`` of the colocated
441
branch to create. (Jelmer Vernooij)
443
* ``BzrDir.get_branch_transport`` now takes an optional ``name`` of the
444
colocated branch to open. (Jelmer Vernooij)
446
* Added ``bzrlib.osutils.set_signal_handler``, a convenience function that
447
can set a signal handler and call ``signal.siginterrupt(signum,
448
False)`` for it, if the platform and Python version supports it.
449
(Andrew Bennetts, #496813)
451
* New ``bzrlib.initialize`` is recommended for programs using bzrlib to
452
run when starting up; it sets up several things that previously needed
453
to be done separately.
454
(Martin Pool, #507710)
456
* Exporters now support a ``per_file_timestamps`` argument to write out the
457
timestamp of the commit in which a file revision was introduced.
460
* New method ``BzrDir.list_branches()`` that returns a sequence of branches
461
present in a control directory. (Jelmer Vernooij)
463
* New method ``Repository.get_known_graph_ancestry()``.
464
(Jelmer Vernooij, #495502)
466
* New transport methods ``readlink``, ``symlink`` and ``hardlink``.
469
* Remove unused ``CommandFailed`` exception.
475
* ``bzrlib.branchbuilder.BranchBuilder.build_snapshot`` now accepts a
476
``message_callback`` in the same way that commit does. (Robert Collins)
478
* ``bzrlib.builtins.Commit.run`` raises ``bzrlib.errors.BoundBranchOutOfDate``
479
rather than ``bzrlib.errors.BzrCommandError`` when the bound branch is out
480
of date. (Gary van der Merwe)
482
* ``bzrlib.commands.run_bzr`` is more extensible: callers can supply the
483
functions to load or disable plugins if they wish to use a different
484
plugin mechanism; the --help, --version and no-command name code paths
485
now use the generic pluggable command lookup infrastructure.
488
* ``bzrlib.errors.BoundBranchOutOfDate`` has a new field ``extra_help``
489
which can be set to add extra help to the error. (Gary van der Merwe)
491
* New method ``Branch.automatic_tag_name`` that can be used to find the
492
tag name for a particular revision automatically. (Jelmer Vernooij)
494
* The methods ``BzrDir.create_branch()``, ``BzrDir.destroy_branch()`` and
495
``BzrDir.open_branch()`` now take an optional ``name`` argument.
501
* bzr now has a ``.testr.conf`` file in its source tree configured
502
appropriately for running tests with Testrepository
503
(``https://launchpad.net/testrepository``). (Robert Collins)
505
* Documentation about testing with ``subunit`` has been tweaked.
508
* Known failures has been added for resolve --take-other on ParentLoop
509
conflicts. This reflects bug #537956 without fixing it.
512
* New ``bzrlib.tests.test_import_tariff`` can make assertions about what
513
Python modules are loaded, to guard against startup time or library
514
dependency regressions.
517
* PQM will now run with subunit output. To analyze a PQM error use
518
tribunal, or cat log | subunit-filter | subunit2pyunit. (Robert Collins)
520
* Stop sending apport crash files to ``.cache`` in the directory from
521
which ``bzr selftest`` was run. (Martin Pool, #422350)
523
* Tests no longer fail if "close() called during concurrent
524
operation on the same file object" occurs when closing the log file
525
(which can happen if a thread tries to write to the log file at the
526
wrong moment). An warning will be written to ``stderr`` when this
527
happens, and another warning will be written if the log file could not
528
be closed after retrying 100 times. (Andrew Bennetts, #531746)
533
:2.1.2: NOT RELEASED YET
538
* ``bzr switch`` does not die if a ConfigurableFileMerger is used.
539
(Aaron Bentley, #559436)
541
* Fixed ``AssertionError`` when accessing smart servers running Bazaar
543
(Andrew Bennetts, #528041)
545
* Reset ``siginterrupt`` flag to False every time we handle a signal
546
installed with ``set_signal_handler(..., restart_syscall=True)`` (from
547
``bzrlib.osutils``. Reduces the likelihood of "Interrupted System Call"
548
errors after two window resizes.
554
* ``_remember_remote_is_before`` no longer raises AssertionError when
555
suboptimal network behaviour is noticed; instead it just mutters to the
556
log file (and warns the user if they have set the ``hpss`` debug flag).
557
This was causing unnecessary aborts for performance bugs that are minor
559
(Andrew Bennetts, #528041)
567
This is a small bugfix release. Upgrading is recommended for anyone
568
running 2.1.0 or earlier.
573
* Allow syscalls to automatically restart when ``TextUIFactory``'s
574
SIGWINCH handler is invoked, avoiding ``EINTR`` errors during blocking
575
IO, which are often poorly handled by Python's libraries and parts of
576
bzrlib. (Andrew Bennetts, #496813)
578
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
579
(Martin Pool, #331095)
581
* Fix plugin packaging on Windows. (Ian Clatworthy, #524162)
583
* Fix stub sftp test server to call os.getcwdu().
584
(Vincent Ladeuil, #526221, #526353)
586
* Fixed CHM generation by moving the NEWS section template into
587
a separate file. (Ian Clatworthy, #524184)
589
* Merge correctly when this_tree is not a WorkingTree. (Aaron Bentley)
591
* Register SIGWINCH handler only when creating a ``TextUIFactory``; avoids
592
problems importing bzrlib from a non-main thread.
593
(Elliot Murphy, #521989)
595
* Repositories accessed via a smart server now reject being stacked on a
596
repository in an incompatible format, as is the case when accessing them
597
via other methods. This was causing fetches from those repositories via
598
a smart server (e.g. using ``bzr branch``) to receive invalid data.
599
(Andrew Bennetts, #562380)
601
* Standardize the error handling when creating a new ``StaticTuple``
602
(problems will raise TypeError). (Matt Nordhoff, #457979)
604
* Warn if pyrex is too old to compile the new ``SimpleSet`` and
605
``StaticTuple`` extensions, rather than having the build fail randomly.
606
(John Arbash Meinel, #449776)
611
* Added a link to the Desktop Guide. (Ian Clatworthy)
613
* Added What's New in Bazaar 2.1 document. (Ian Clatworthy)
615
* Drop Google Analytics from the core docs as they caused problems
616
in the CHM files. (Ian Clatworthy, #502010)
621
* Added ``bzrlib.osutils.set_signal_handler``, a convenience function that
622
can set a signal handler and call ``signal.siginterrupt(signum,
623
False)`` for it, if the platform and Python version supports it.
624
(Andrew Bennetts, #496813)
630
:Codename: Strasbourg
633
This release marks our second long-term-stable series. The Bazaar team
634
has decided that we will continue to make bugfix-only 2.0.x and 2.1.x
635
releases, along with 2.2 development releases.
637
This is a fairly incremental update, focusing on polish and bugfixing.
638
There are no changes for supported disk formats. Key updates include
639
reduced memory consumption for many operations, a new per-file merge
640
hook, ignore patterns can now include '!' to exclude files, globbing
641
support for all commands on Windows, and support for addressing home
642
directories via ``bzr+ssh://host/~/`` syntax.
644
Users are encouraged to upgrade from the 2.0 stable series.
649
* Don't require testtools to use sftp.
650
(Vincent Ladeuil, #516183)
652
* Fix "AttributeError in Inter1and2Helper" during fetch.
653
(Martin Pool, #513432)
655
* ``bzr update`` performs the two merges in a more logical order and will stop
656
when it encounters conflicts.
657
(Gerard Krol, #113809)
659
* Give a better error message when doing ``bzr bind`` in an already bound
660
branch. (Neil Martinsen-Burrell, #513063)
662
* Ignore ``KeyError`` from ``remove_index`` during ``_abort_write_group``
663
in a pack repository, which can happen harmlessly if the abort occurs during
664
finishing the write group. Also use ``bzrlib.cleanup`` so that any
665
other errors that occur while aborting the individual packs won't be
666
hidden by secondary failures when removing the corresponding indices.
667
(Andrew Bennetts, #423015)
669
* Set the mtime of files exported to a directory by ``bzr export`` all to
670
the same value to avoid confusing ``make`` and other date-based build
671
systems. (Robert Collins, #515631)
676
* Fetching into experimental formats will now print a warning. (Jelmer
682
* ``Repository.deserialise_inventory`` has been renamed to
683
``Repository._deserialise_inventory`` to indicate it is private.
686
* ``Repository.get_inventory_xml`` has been renamed to
687
``Repository._get_inventory_xml`` to indicate it is private.
690
* ``Repository.serialise_inventory`` has been renamed to
691
``Repository._serialise_inventory`` to indicate it is private.
693
* Using the ``bzrlib.chk_map`` module from within multiple threads at the
694
same time was broken due to race conditions with a module level page
695
cache. This shows up as a KeyError in the ``bzrlib.lru_cache`` code with
696
``bzrlib.chk_map`` in the backtrace, and can be triggered without using
697
the same high level objects such as ``bzrlib.repository.Repository``
698
from different threads. chk_map now uses a thread local cache which may
699
increase memory pressure on processes using threads.
700
(Robert Collins, John Arbash Meinel, #514090)
702
* The new ``merge_file_content`` should now be ok with tests to avoid
704
(Vincent Ladeuil, #515597)
709
* Use ``bzrlib.cleanup`` rather than less robust ``try``/``finally``
710
blocks in several places in ``bzrlib.merge``. This avoids masking prior
711
errors when errors like ``ImmortalPendingDeletion`` occur during cleanup
713
(Andrew Bennetts, #517275)
718
* The ``remove_index`` method of
719
``bzrlib.repofmt.pack_repo.AggregateIndex`` no longer takes a ``pack``
720
argument. This argument was always ignored.
721
(Andrew Bennetts, #423015)
726
:Codename: after the bubbles
727
:2.1.0rc2: 2010-01-29
729
This is a quick-turn-around to update a small issue with our new per-file
730
merge hook. We expect no major changes from this to the final 2.1.0.
735
* The new ``merge_file_content`` hook point has been altered to provide a
736
better API where state for extensions can be stored rather than the
737
too-simple function based approach. This fixes a performance regression
738
where branch configuration would be parsed per-file during merge. As
739
part of this the included news_merger has been refactored into a base
740
helper class ``bzrlib.merge.ConfigurableFileMerger``.
741
(Robert Collins, John Arbash Meinel, #513822)
8
bzr 2.2.0b1 (not released yet)
9
##############################
added
removed
NEWS
