/brz/remove-bazaar

IN DEVELOPMENT

  BUGFIXES:

    * Do not suppress pipe errors, etc. in non-display commands

      (Alexander Belchenko, #87178)

    * Display a useful error message when the user requests to annotate

      a file that is not present in the specified revision.

      (James Westby, #122656)

    * Commands that use status flags now have a reference to 'help

      status-flags'.  (Daniel Watkins, #113436)

    * Work around python-2.4.1 inhability to correctly parse the

      authentication header.

      (Vincent Ladeuil, #121889)

    * Use exact encoding for merge directives. (Adeodato Simó, #120591)

    * Fix tempfile permissions error in smart server tar bundling under

      Windows. (Martin_, #119330)

    * Fix detection of directory entries in the inventory. (James Westby)

    * Fix handling of http code 400: Bad Request When issuing too many ranges.

      (Vincent Ladeuil, #115209)

    * Issue a CONNECT request when connecting to an https server

      via a proxy to enable SSL tunneling.

     (Vincent Ladeuil, #120678)

    * Fix ``bzr log -r`` to support selecting merge revisions, both 

      individually and as part of revision ranges.

      (Kent Gibson, #4663)

    * Don't leave cruft behind when failing to acquire a lockdir.

      (Martin Pool, #109169)

    * Don't use the '-f' strace option during tests.

      (Vincent Ladeuil, #102019).

    * Warn when setting ``push_location`` to a value that will be masked by

      locations.conf.  (Aaron Bentley, #122286)

    * Fix commit ordering in corner case (Aaron Bentley, #94975)

    *  Make annotate behave in a non-ASCII world (Adeodato Simó).

  IMPROVEMENTS:

    * The --lsprof-file option now dumps a text rendering of the profiling

      information if the filename ends in ".txt". It will also convert the

      profiling information to a format suitable for KCacheGrind if the

      output filename ends in ".callgrind". Fixes to the lsprofcalltree

      conversion process by Jean Paul Calderone and Itamar were also merged.

      See http://ddaa.net/blog/python/lsprof-calltree. (Ian Clatworthy)

    * ``info`` now defaults to non-verbose mode, displaying only paths and

      abbreviated format info.  ``info -v`` displays all the information

      formerly displayed by ``info``.  (Aaron Bentley, Adeodato Simó)

    * ``bzr missing`` now has better option names ``--this`` and ``--other``.

      (Elliot Murphy)

    * The internal ``weave-list`` command has become ``versionedfile-list``,

      and now lists knits as well as weaves.  (Aaron Bentley)

    * Automatic merge base selection uses a faster algorithm that chooses

      better bases in criss-cross merge situations (Aaron Bentley)

    * Progress reporting in ``commit`` has been improved. The various logical

      stages are now reported on as follows, namely:

      * Collecting changes [Entry x/y] - Stage n/m

      * Saving data locally - Stage n/m

      * Uploading data to master branch - Stage n/m

      * Updating the working tree - Stage n/m

      * Running post commit hooks - Stage n/m

      If there is no master branch, the 3rd stage is omitted and the total

      number of stages is adjusted accordingly.

      Each hook that is run after commit is listed with a name (as hooks

      can be slow it is useful feedback).

      (Ian Clatworthy, Robert Collins)

    * Various operations that are now faster due to avoiding unnecessary

      topological sorts. (Aaron Bentley)

    * Make merge directives robust against broken bundles. (Aaron Bentley)

    * The lsprof filename note is emitted via trace.note(), not standard

      output.  (Aaron Bentley)

    * ``bzrlib`` now exports explicit API compatibility information to assist

      library users and plugins. See the ``bzrlib.api`` module for details.

      (Robert Collins)

    * Remove unnecessary lock probes when acquiring a lockdir.

      (Martin Pool)

    * ``bzr --version`` now shows the location of the bzr log file, which

      is especially useful on Windows.  (Martin Pool)

    * -D now supports hooks to get debug tracing of hooks (though its currently

      minimal in nature). (Robert Collins)

    * Long log format reports deltas on merge revisions. 

      (John Arbash Meinel, Kent Gibson)

    * Make initial push over ftp more resilient. (John Arbash Meinel)

    * Print a summary of changes for update just like pull does.

      (Daniel Watkins, #113990)

    * Add a -Dhpss option to trace smart protocol requests and responses.

      (Andrew Bennetts)

  LIBRARY API BREAKS:

    * Testing cleanups - 

     ``bzrlib.repository.RepositoryTestProviderAdapter`` has been moved

      to ``bzrlib.tests.repository_implementations``;

      ``bzrlib.repository.InterRepositoryTestProviderAdapter`` has been moved

      to ``bzrlib.tests.interrepository_implementations``;

      ``bzrlib.transport.TransportTestProviderAdapter`` has moved to 

      ``bzrlib.tests.test_transport_implementations``.

      ``bzrlib.branch.BranchTestProviderAdapter`` has moved to

      ``bzrlib.tests.branch_implementations``.

      ``bzrlib.bzrdir.BzrDirTestProviderAdapter`` has moved to 

      ``bzrlib.tests.bzrdir_implementations``.

      ``bzrlib.versionedfile.InterVersionedFileTestProviderAdapter`` has moved

      to ``bzrlib.tests.interversionedfile_implementations``.

      ``bzrlib.store.revision.RevisionStoreTestProviderAdapter`` has moved to

      ``bzrlib.tests.revisionstore_implementations``.

      ``bzrlib.workingtree.WorkingTreeTestProviderAdapter`` has moved to

      ``bzrlib.tests.workingtree_implementations``.

      These changes are an API break in the testing infrastructure only.

      (Robert Collins)

    * Relocate TestCaseWithRepository to be more central. (Robert Collins)

    * ``bzrlib.add.smart_add_tree`` will no longer perform glob expansion on

      win32. Callers of the function should do this and use the new

      ``MutableTree.smart_add`` method instead. (Robert Collins)

    * ``bzrlib.add.glob_expand_for_win32`` is now

      ``bzrlib.win32utils.glob_expand``.  (Robert Collins)

    * ``bzrlib.add.FastPath`` is now private and moved to 

      ``bzrlib.mutabletree._FastPath``. (Robert Collins, Martin Pool)

    * ``LockDir.wait`` removed.  (Martin Pool)

    * The ``SmartServer`` hooks API has changed for the ``server_started`` and

      ``server_stopped`` hooks. The first parameter is now an iterable of

      backing URLs rather than a single URL. This is to reflect that many

      URLs may map to the external URL of the server. E.g. the server interally

      may have a chrooted URL but also the local file:// URL will be at the 

      same location. (Robert Collins)

  INTERNALS:

    * New SMTPConnection class to unify email handling.  (Adeodato Simó)

    * Fix documentation of BzrError. (Adeodato Simó)

    * Make BzrBadParameter an internal error. (Adeodato Simó)

    * Remove use of 'assert False' to raise an exception unconditionally.

      (Martin Pool)

    * Give a cleaner error when failing to decode knit index entry.

      (Martin Pool)

    * TreeConfig would mistakenly search the top level when asked for options

      from a section. It now respects the section argument and only

      searches the specified section. (James Westby)

    * Improve ``make api-docs`` output. (John Arbash Meinel)

    * Use os.lstat rather than os.stat for osutils.make_readonly and

      osutils.make_writeable. This makes the difftools plugin more

      robust when dangling symlinks are found. (Elliot Murphy)

    * New ``-Dlock`` option to log (to ~/.bzr.log) information on when 

      lockdirs are taken or released.  (Martin Pool)

    * ``bzrlib`` Hooks are now nameable using ``Hooks.name_hook``. This 

      allows a nicer UI when hooks are running as the current hook can

      be displayed. (Robert Collins)

    * ``Transport.get`` has had its interface made more clear for ease of use.

      Retrieval of a directory must now fail with either 'PathError' at open

      time, or raise 'ReadError' on a read. (Robert Collins)

    * New method ``_maybe_expand_globs`` on the ``Command`` class for 

      dealing with unexpanded glob lists - e.g. on the win32 platform. This

      was moved from ``bzrlib.add._prepare_file_list``. (Robert Collins)

    * ``bzrlib.add.smart_add`` and ``bzrlib.add.smart_add_tree`` are now

      deprecated in favour of ``MutableTree.smart_add``. (Robert Collins,

      Martin Pool)

    * New method ``external_url`` on Transport for obtaining the url to

      hand to external processes. (Robert Collins)

    * Teach windows installers to build pyrex/C extensions.

      (Alexander Belchenko)

  TESTING:

    * Removed the ``--keep-output`` option from selftest and clean up test

      directories as they're used.  This reduces the IO load from 

      running the test suite and cuts the time by about half.

      (Andrew Bennetts, Martin Pool)

    * Add scenarios as a public attribute on the TestAdapter classes to allow

      modification of the generated scenarios before adaption and easier

      testing. (Robert Collins)

    * New testing support class ``TestScenarioApplier`` which multiplies

      out a single teste by a list of supplied scenarios. (RobertCollins)

    * Setting ``repository_to_test_repository`` on a repository_implementations

      test will cause it to be called during repository creation, allowing the

      testing of repository classes which are not based around the Format

      concept. For example a repository adapter can be tested in this manner,

      by altering the repository scenarios to include a scenario that sets this

      attribute during the test parameterisation in

      ``bzrlib.tests.repository.repository_implementations``. (Robert Collins)

    * Clean up many of the APIs for blackbox testing of Bazaar.  The standard 

      interface is now self.run_bzr.  The command to run can be passed as

      either a list of parameters, a string containing the command line, or

      (deprecated) varargs parameters.  (Martin Pool)

    * The base TestCase now isolates tests from -D parameters by clearing

      ``debug.debug_flags`` and restores it afterwards. (Robert Collins)

    * Add a relpath parameter to get_transport methods in test framework to

      avoid useless cloning.

      (Vincent Ladeuil, #110448)

bzr 0.17  2007-06-18

  BUGFIXES:

    * Fix crash of commit due to wrong lookup of filesystem encoding.

      (Colin Watson, #120647)

    * Revert logging just to stderr in commit as broke unicode filenames.

      (Aaron Bentley, Ian Clatworthy, #120930)

bzr 0.17rc1  2007-06-12

  NOTES WHEN UPGRADING:

    * The kind() and is_executable() APIs on the WorkingTree interface no

      longer implicitly (read) locks and unlocks the tree. This *might*

      impact some plug-ins and tools using this part of the API. If you find

      an issue that may be caused by this change, please let us know,

      particularly the plug-in/tool maintainer. If encountered, the API

      fix is to surround kind() and is_executable() calls with lock_read()

      and unlock() like so::

        work_tree.lock_read()

        try:

            kind = work_tree.kind(...)

        finally:

            work_tree.unlock()

  INTERNALS:

    * Rework of LogFormatter API to provide beginning/end of log hooks and to

      encapsulate the details of the revision to be logged in a LogRevision

      object.

      In long log formats, merge revision ids are only shown when --show-ids

      is specified, and are labelled "revision-id:", as per mainline

      revisions, instead of "merged:". (Kent Gibson)

    * New ``BranchBuilder`` API which allows the construction of particular

      histories quickly. Useful for testing and potentially other applications

      too. (Robert Collins)

  IMPROVEMENTS:

    * There are two new help topics, working-trees and repositories that

      attempt to explain these concepts. (James Westby, John Arbash Meinel,

      Aaron Bentley)

    * Added ``bzr log --limit`` to report a limited number of revisions.

      (Kent Gibson, #3659)

    * Revert does not try to preserve file contents that were originally

      produced by reverting to a historical revision.  (Aaron Bentley)

    * ``bzr log --short`` now includes ``[merge]`` for revisions which

      have more than one parent. This is a small improvement to help

      understanding what changes have occurred

      (John Arbash Meinel, #83887)

    * TreeTransform avoids many renames when contructing large trees,

      improving speed.  3.25x speedups have been observed for construction of

      kernel-sized-trees, and checkouts are 1.28x faster.  (Aaron Bentley)

    * Commit on large trees is now faster. In my environment, a commit of

      a small change to the Mozilla tree (55k files) has dropped from

      66 seconds to 32 seconds. For a small tree of 600 files, commit of a

      small change is 33% faster. (Ian Clatworthy)

    * New --create-prefix option to bzr init, like for push.  (Daniel Watkins,

      #56322)

  BUGFIXES:

    * ``bzr push`` should only connect to the remote location one time.

      We have been connecting 3 times because we forget to pass around

      the Transport object. This adds ``BzrDir.clone_on_transport()``, so

      that we can pass in the Transport that we already have.

      (John Arbash Meinel, #75721)

    * ``DirState.set_state_from_inventory()`` needs to properly order

      based on split paths, not just string paths.

      (John Arbash Meinel, #115947)

    * Let TestUIFactoy encode the password prompt with its own stdout.

      (Vincent Ladeuil, #110204)

    * pycurl should take use the range header that takes the range hint

      into account.

      (Vincent Ladeuil, #112719)

    * WorkingTree4.get_file_sha1 no longer raises an exception when invoked

      on a missing file.  (Aaron Bentley, #118186)

    * WorkingTree.remove works correctly with tree references, and when pwd is

      not the tree root. (Aaron Bentley)

    * Merge no longer fails when a file is renamed in one tree and deleted

      in the other. (Aaron Bentley, #110279)

    * ``revision-info`` now accepts dotted revnos, doesn't require a tree,

      and defaults to the last revision (Matthew Fuller, #90048)

    * Tests no longer fail when BZR_REMOTE_PATH is set in the environment.

      (Daniel Watkins, #111958)

    * ``bzr branch -r revid:foo`` can be used to branch any revision in

      your repository. (Previously Branch6 only supported revisions in your

      mainline). (John Arbash Meinel, #115343)

bzr 0.16  2007-05-07

  BUGFIXES:

    * Handle when you have 2 directories with similar names, but one has a

      hyphen. (``'abc'`` versus ``'abc-2'``). The WT4._iter_changes

      iterator was using direct comparison and ``'abc/a'`` sorts after

      ``'abc-2'``, but ``('abc', 'a')`` sorts before ``('abc-2',)``.

      (John Arbash Meinel, #111227)

    * Handle when someone renames a file on disk without telling bzr.

      Previously we would report the first file as missing, but not show

      the new unknown file. (John Arbash Meinel, #111288)

    * Avoid error when running hooks after pulling into or pushing from

      a branch bound to a smartserver branch.  (Martin Pool, #111968)

  IMPROVEMENTS:

    * Move developer documentation to doc/developers/. This reduces clutter in

      the root of the source tree and allows HACKING to be split into multiple

      files. (Robert Collins, Alexander Belchenko)

    * Clean up the ``WorkingTree4._iter_changes()`` internal loops as well as

      ``DirState.update_entry()``. This optimizes the core logic for ``bzr

      diff`` and ``bzr status`` significantly improving the speed of

      both. (John Arbash Meinel)

bzr 0.16rc2  2007-04-30

  BUGFIXES:

    * Handle the case when you delete a file, and then rename another file

      on top of it. Also handle the case of ``bzr rm --keep foo``. ``bzr

      status`` should show the removed file and an unknown file in its

      place. (John Arbash Meinel, #109993)

    * Bundles properly read and write revision properties that have an

      empty value. And when the value is not ASCII.

      (John Arbash Meinel, #109613)

    * Fix the bzr commit message to be in text mode.

      (Alexander Belchenko, #110901)

    * Also handle when you rename a file and create a file where it used

      to be. (John Arbash Meinel, #110256)

    * ``WorkingTree4._iter_changes`` should not descend into unversioned

      directories. (John Arbash Meinel, #110399)

bzr 0.16rc1  2007-04-26

  NOTES WHEN UPGRADING:

    * ``bzr remove`` and ``bzr rm`` will now remove the working file, if

      it could be recovered again.

      This has been done for consistency with svn and the unix rm command.

      The old ``remove`` behaviour has been retained in the new option

      ``bzr remove --keep``, which will just stop versioning the file,

      but not delete it.

      ``bzr remove --force`` have been added which will always delete the

      files.

      ``bzr remove`` is also more verbose.

      (Marius Kruger, #82602)

  IMPROVEMENTS:

    * Merge directives can now be supplied as input to `merge` and `pull`,

      like bundles can.  (Aaron Bentley)

    * Sending the SIGQUIT signal to bzr, which can be done on Unix by

      pressing Control-Backslash, drops bzr into a debugger.  Type ``'c'``

      to continue.  This can be disabled by setting the environment variable

      ``BZR_SIGQUIT_PDB=0``.  (Martin Pool)

    * selftest now supports --list-only to list tests instead of running

      them. (Ian Clatworthy)

    * selftest now supports --exclude PATTERN (or -x PATTERN) to exclude

      tests with names that match that regular expression.

      (Ian Clatworthy, #102679)

    * selftest now supports --randomize SEED to run tests in a random order.

      SEED is typically the value 'now' meaning 'use the current time'.

      (Ian Clatworthy, #102686)

    * New option ``--fixes`` to commit, which stores bug fixing annotations as

      revision properties. Built-in support for Launchpad, Debian, Trac and

      Bugzilla bug trackers. (Jonathan Lange, James Henstridge, Robert Collins)

    * New API, ``bzrlib.bugtracker.tracker_registry``, for adding support for

      other bug trackers to ``fixes``. (Jonathan Lange, James Henstridge,

      Robert Collins)

    * ``selftest`` has new short options ``-f`` and ``-1``.  (Martin

      Pool)

    * ``bzrlib.tsort.MergeSorter`` optimizations. Change the inner loop

      into using local variables instead of going through ``self._var``.

      Improves the time to ``merge_sort`` a 10k revision graph by

      approximately 40% (~700->400ms).  (John Arbash Meinel)

    * ``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388.

      (Robert Collins)

    * ``bzr help`` now provides cross references to other help topics using

      the _see_also facility on command classes. Likewise the bzr_man

      documentation, and the bzr.1 man page also include this information.

      (Robert Collins)

    * Tags are now included in logs, that use the long log formatter. 

      (Erik Bågfors, Alexander Belchenko)

    * ``bzr help`` provides a clearer message when a help topic cannot be

      found. (Robert Collins, #107656)

    * ``bzr help`` now accepts optional prefixes for command help. The help

      for all commands can now be found at ``bzr help commands/COMMANDNAME``

      as well as ``bzr help COMMANDNAME`` (which only works for commands 

      where the name is not the same as a more general help topic). 

      (Robert Collins)

    * ``bzr help PLUGINNAME`` will now return the module docstring from the

      plugin PLUGINNAME. (Robert Collins, #50408)

    * New help topic ``urlspec`` which lists the availables transports.

      (Goffredo Baroncelli)

    * doc/server.txt updated to document the default bzr:// port

      and also update the blurb about the hpss' current status.

      (Robert Collins, #107125).

    * ``bzr serve`` now listens on interface 0.0.0.0 by default, making it

      serve out to the local LAN (and anyone in the world that can reach the

      machine running ``bzr serve``. (Robert Collins, #98918)

    * A new smart server protocol version has been added.  It prefixes requests

      and responses with an explicit version identifier so that future protocol

      revisions can be dealt with gracefully.  (Andrew Bennetts, Robert Collins)

    * The bzr protocol version 2 indicates success or failure in every response

      without depending on particular commands encoding that consistently,

      allowing future client refactorings to be much more robust about error

      handling. (Robert Collins, Martin Pool, Andrew Bennetts)

    * The smart protocol over HTTP client has been changed to always post to the

      same ``.bzr/smart`` URL under the original location when it can.  This allows

      HTTP servers to only have to pass URLs ending in .bzr/smart to the smart

      server handler, and not arbitrary ``.bzr/*/smart`` URLs.  (Andrew Bennetts)

    * digest authentication is now supported for proxies and HTTP by the urllib

      based http implementation. Tested against Apache 2.0.55 and Squid

      2.6.5. Basic and digest authentication are handled coherently for HTTP

      and proxy: if the user is provided in the url (bzr command line for HTTP,

      proxy environment variables for proxies), the password is prompted for

      (only once). If the password is provided, it is taken into account. Once

      the first authentication is successful, all further authentication

      roundtrips are avoided by preventively setting the right authentication

      header(s).

      (Vincent Ladeuil).

  INTERNALS:

    * bzrlib API compatability with 0.8 has been dropped, cleaning up some

      code paths. (Robert Collins)

    * Change the format of chroot urls so that they can be safely manipulated

      by generic url utilities without causing the resulting urls to have

      escaped the chroot. A side effect of this is that creating a chroot

      requires an explicit action using a ChrootServer.

      (Robert Collins, Andrew Bennetts)

    * Deprecate ``Branch.get_root_id()`` because branches don't have root ids,

      rather than fixing bug #96847.  (Aaron Bentley)

    * ``WorkingTree.apply_inventory_delta`` provides a better alternative to

      ``WorkingTree._write_inventory``.  (Aaron Bentley)

    * Convenience method ``TestCase.expectFailure`` ensures that known failures

      do not silently pass.  (Aaron Bentley)

    * ``Transport.local_abspath`` now raises ``NotLocalUrl`` rather than 

      ``TransportNotPossible``. (Martin Pool, Ian Clatworthy)

    * New SmartServer hooks facility. There are two initial hooks documented

      in ``bzrlib.transport.smart.SmartServerHooks``. The two initial hooks allow

      plugins to execute code upon server startup and shutdown.

      (Robert Collins).

    * SmartServer in standalone mode will now close its listening socket

      when it stops, rather than waiting for garbage collection. This primarily

      fixes test suite hangs when a test tries to connect to a shutdown server.

      It may also help improve behaviour when dealing with a server running

      on a specific port (rather than dynamically assigned ports).

      (Robert Collins)

    * Move most SmartServer code into a new package, bzrlib/smart.

      bzrlib/transport/remote.py contains just the Transport classes that used

      to be in bzrlib/transport/smart.py.  (Andrew Bennetts)

    * urllib http implementation avoid roundtrips associated with

      401 (and 407) errors once the authentication succeeds.

      (Vincent Ladeuil).

    * urlib http now supports querying the user for a proxy password if

      needed. Realm is shown in the prompt for both HTTP and proxy

      authentication when the user is required to type a password. 

      (Vincent Ladeuil).

    * Renamed SmartTransport (and subclasses like SmartTCPTransport) to

      RemoteTransport (and subclasses to RemoteTCPTransport, etc).  This is more

      consistent with its new home in ``bzrlib/transport/remote.py``, and because

      it's not really a "smart" transport, just one that does file operations

      via remote procedure calls.  (Andrew Bennetts)

    * The ``lock_write`` method of ``LockableFiles``, ``Repository`` and

      ``Branch`` now accept a ``token`` keyword argument, so that separate

      instances of those objects can share a lock if it has the right token.

      (Andrew Bennetts, Robert Collins)

    * New method ``get_branch_reference`` on ``BzrDir`` allows the detection of

      branch references - which the smart server component needs.

    * The Repository API ``make_working_trees`` is now permitted to return

      False when ``set_make_working_trees`` is not implemented - previously

      an unimplemented ``set_make_working_trees`` implied the result True

      from ``make_working_trees``. This has been changed to accomodate the

      smart server, where it does not make sense (at this point) to ever

      make working trees by default. (Robert Collins)

    * Command objects can now declare related help topics by having _see_also

      set to a list of related topic. (Robert Collins)

    * ``bzrlib.help`` now delegates to the Command class for Command specific

      help. (Robert Collins)

    * New class ``TransportListRegistry``, derived from the Registry class, which 

      simplifies tracking the available Transports. (Goffredo Baroncelli)

    * New function ``Branch.get_revision_id_to_revno_map`` which will

      return a dictionary mapping revision ids to dotted revnos. Since

      dotted revnos are defined in the context of the branch tip, it makes

      sense to generate them from a ``Branch`` object.

      (John Arbash Meinel)

    * Fix the 'Unprintable error' message display to use the repr of the 

      exception that prevented printing the error because the str value

      for it is often not useful in debugging (e.g. KeyError('foo') has a

      str() of 'foo' but a repr of 'KeyError('foo')' which is much more

      useful. (Robert Collins)

    * ``urlutils.normalize_url`` now unescapes unreserved characters, such as "~".

      (Andrew Bennetts)

  BUGFIXES:

    * Don't fail bundle selftest if email has 'two' embedded.  

      (Ian Clatworthy, #98510)

    * Remove ``--verbose`` from ``bzr bundle``. It didn't work anyway.

      (Robert Widhopf-Fenk, #98591)

    * Remove ``--basis`` from the checkout/branch commands - it didn't work

      properly and is no longer beneficial.

      (Robert Collins, #53675, #43486)

    * Don't produce encoding error when adding duplicate files.

      (Aaron Bentley)

    * Fix ``bzr log <file>`` so it only logs the revisions that changed

      the file, and does it faster.

      (Kent Gibson, John Arbash Meinel, #51980, #69477)

    * Fix ``InterDirstateTre._iter_changes`` to handle when we come across

      an empty versioned directory, which now has files in it.

      (John Arbash Meinel, #104257)

    * Teach ``common_ancestor`` to shortcut when the tip of one branch is

      inside the ancestry of the other. Saves a lot of graph processing

      (with an ancestry of 16k revisions, ``bzr merge ../already-merged``

      changes from 2m10s to 13s).  (John Arbash Meinel, #103757)

    * Fix ``show_diff_trees`` to handle the case when a file is modified,

      and the containing directory is renamed. (The file path is different

      in this versus base, but it isn't marked as a rename).

      (John Arbash Meinel, #103870)

    * FTP now works even when the FTP server does not support atomic rename.

      (Aaron Bentley, #89436)

    * Correct handling in bundles and merge directives of timezones with

      that are not an integer number of hours offset from UTC.  Always 

      represent the epoch time in UTC to avoid problems with formatting 

      earlier times on win32.  (Martin Pool, Alexander Belchenko, John

      Arbash Meinel)

    * Typo in the help for ``register-branch`` fixed. (Robert Collins, #96770)

    * "dirstate" and "dirstate-tags" formats now produce branches compatible

      with old versions of bzr. (Aaron Bentley, #107168))