branch-formats up to date with integration again

[Robert Collins]

Well, that was a 2-day conflict resolution :p.

But, branch-formats is again up to date with integration, for anyone
playing with it.

bzr diff -r branch:../integration | wc -l
7362                                                                           

bzr diff -r branch:../integration | diffstat
 BRANCH.TODO                                        |   17
 bzrlib/branch.py                                   |  508
+++++++++++++++------
 bzrlib/builtins.py                                 |   58 +-
 bzrlib/check.py                                    |    2
 bzrlib/commands.py                                 |   14
 bzrlib/commit.py                                   |   37 +
 bzrlib/errors.py                                   |   24
 bzrlib/inventory.py                                |    2
 bzrlib/lockable_files.py                           |   11
 bzrlib/merge.py                                    |   34 -
 bzrlib/repository.py                               |   32 -
 bzrlib/symbol_versioning.py                        |   32 +
 bzrlib/tests/__init__.py                           |  162 +++++-
 bzrlib/tests/blackbox/__init__.py                  |    3
 bzrlib/tests/blackbox/test_diff.py                 |   21
 bzrlib/tests/blackbox/test_outside_wt.py           |    4
 bzrlib/tests/blackbox/test_revision_info.py        |   23
 bzrlib/tests/blackbox/test_selftest.py             |   69 ++
 bzrlib/tests/blackbox/test_too_much.py             |   62 +-
 bzrlib/tests/blackbox/test_upgrade.py              |   42 +
 bzrlib/tests/blackbox/test_versioning.py           |   21
 bzrlib/tests/branch_implementations/__init__.py    |   49 ++
 bzrlib/tests/branch_implementations/test_branch.py |  286 +++++++----
 bzrlib/tests/test_ancestry.py                      |   16
 bzrlib/tests/test_annotate.py                      |   16
 bzrlib/tests/test_bad_files.py                     |   29 -
 bzrlib/tests/test_basis_inventory.py               |    8
 bzrlib/tests/test_branch.py                        |  121 +++++
 bzrlib/tests/test_commit.py                        |  178 +++----
 bzrlib/tests/test_commit_merge.py                  |   52 +-
 bzrlib/tests/test_conflicts.py                     |   10
 bzrlib/tests/test_fetch.py                         |   83 +--
 bzrlib/tests/test_fileid_involved.py               |  112 ++--
 bzrlib/tests/test_inv.py                           |   48 -
 bzrlib/tests/test_log.py                           |   32 -
 bzrlib/tests/test_merge.py                         |   61 +-
 bzrlib/tests/test_merge_core.py                    |  142 ++---
 bzrlib/tests/test_missing.py                       |   35 -
 bzrlib/tests/test_msgeditor.py                     |    8
 bzrlib/tests/test_nonascii.py                      |   17
 bzrlib/tests/test_parent.py                        |   21
 bzrlib/tests/test_permissions.py                   |   30 -
 bzrlib/tests/test_remove.py                        |   12
 bzrlib/tests/test_revision.py                      |   49 +-
 bzrlib/tests/test_revisionnamespaces.py            |   33 -
 bzrlib/tests/test_revprops.py                      |   18
 bzrlib/tests/test_selftest.py                      |   62 ++
 bzrlib/tests/test_sftp_transport.py                |   11
 bzrlib/tests/test_smart_add.py                     |  133 ++---
 bzrlib/tests/test_source.py                        |    4
 bzrlib/tests/test_symbol_versioning.py             |   16
 bzrlib/tests/test_testament.py                     |   13
 bzrlib/tests/test_transport.py                     |   29 +
 bzrlib/tests/test_transport_implementations.py     |  149 +++++-
 bzrlib/tests/test_upgrade.py                       |   29 +
 bzrlib/tests/test_whitebox.py                      |   65 --
 bzrlib/tests/test_workingtree.py                   |  159 ++++--
 bzrlib/trace.py                                    |   21
 bzrlib/transport/__init__.py                       |   60 ++
 bzrlib/transport/http.py                           |    4
 bzrlib/transport/local.py                          |    8
 bzrlib/transport/memory.py                         |   77 ++-
 bzrlib/transport/readonly.py                       |  153 ++++++
 bzrlib/transport/sftp.py                           |   56 --
 bzrlib/upgrade.py                                  |  203 ++++----
 bzrlib/workingtree.py                              |  121 +++--
 test_status.py                                     |   56 +-
 67 files changed, 2747 insertions(+), 1326 deletions(-)


Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060127/4d62ec7e/attachment.pgp