[MERGE] checkout

[Robert Collins]

On Sun, 2006-02-12 at 17:18 -0600, John A Meinel wrote:
> My mail client sucks, so I lost the text of your message.
> But I checked out your branch. And it seems to depend on your BzrDir
> work. So can we wait for that to land before I evaluate checkouts?
> Otherwise it is difficult to find the checkout changes.

It does indeed depend on that work.... I'm attaching a diff of the
checkout work - if you are happy with that I'll merge it into the
bzr-dir branch, and they can come in together.

bzr diff -r ancestor:../bzr-dir | wc -l
1632
robertc at lifelesslap:~/source/baz/checkout$ bzr diff -r
ancestor:../bzr-dir | diffstat
 add.py                                                |    2 
 branch.py                                             |    6 
 builtins.py                                           |   84 ++++++++-
 bzrdir.py                                             |   31 ++-
 commit.py                                             |    7 
 diff.py                                               |    7 
 errors.py                                             |    5 
 info.py                                               |    2 
 status.py                                             |    5 
 tests/blackbox/__init__.py                            |    3 
 tests/blackbox/test_checkout.py                       |   55 ++++++
 tests/blackbox/test_commit.py                         |   84 +++++++++
 tests/blackbox/test_too_much.py                       |   36 ---
 tests/blackbox/test_update.py                         |   97 ++++++++++
 tests/blackbox/test_versioning.py                     |   10 -
 tests/bzrdir_implementations/test_bzrdir.py           |   21 +-
 tests/test_inv.py                                     |   67 +++----
 tests/test_merge.py                                   |    2 
 tests/test_merge_core.py                              |   37 ++--
 tests/test_permissions.py                             |    8 
 tests/test_revision.py                                |    4 
 tests/test_source.py                                  |    2 
 tests/test_workingtree.py                             |   10 -
 tests/workingtree_implementations/test_workingtree.py |  129
++++++++++++--
 workingtree.py                                        |  164
++++++++++++++----
 25 files changed, 685 insertions(+), 193 deletions(-)


Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: checkout.patch
Type: text/x-patch
Size: 66448 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060213/cf088460/attachment.bin 
-------------- 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/20060213/cf088460/attachment.pgp