~bzr-pqm/bzr/bzr.dev

Viewing changes to NEWS

Changes as per Martin [gz]'s review.

Added NEWS entry.

Minor: explicitly close files written to in tests, fixed whitespace.

added added

removed removed

* New development format ``development8-subtree`` which is similar to the

``2a`` format and adds subtree support. (Jelmer Vernooij)

* The ``pull`` and ``update`` commands now take a ``-show-base``

option that, in the case of conflicts, shows the base revision text.

(Rory Yorke, #202374)

Bug Fixes

*********

277

281

constructor has been deprecated, use the ``file_name`` parameter instead.

278

282

(Vincent Ladeuil)

279

283

284

* ``WorkingTree`` methods ``pull``, ``update``, and ``_update_tree``

285

now have an optional argument, ``show_base``, which is by default

286

False. This is flag is ultimately passed to ``merge.merge_inner``

287

in each case. (Rory Yorke, #202374)

288

280

289

Internals

281

290

*********

282

291