Rev 444: Fix bind. in file:///home/jelmer/bzr-svn/customrevids/

[Jelmer Vernooij]

At file:///home/jelmer/bzr-svn/customrevids/

------------------------------------------------------------
revno: 444
revision-id: jelmer at samba.org-20070518173705-7e51s6m9bdn3h6wd
parent: jelmer at samba.org-20070518164929-14kc2rnucp1bx60y
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: customrevids
timestamp: Fri 2007-05-18 18:37:05 +0100
message:
  Fix bind.
removed:
  BRANCH.TODO                    branch.todo-20070516183134-f9xjfbsv6x6u6x2t-1
modified:
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  tests/test_commit.py           test_commit.py-20060624213521-l5kcufywkh9mnilk-1
=== removed file 'BRANCH.TODO'
--- a/BRANCH.TODO	2007-05-18 16:49:29 +0000
+++ b/BRANCH.TODO	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-- test commits in heavyweight bound branches

=== modified file 'repository.py'
--- a/repository.py	2007-05-18 16:49:29 +0000
+++ b/repository.py	2007-05-18 17:37:05 +0000
@@ -86,6 +86,7 @@
             text += "\t%s: %s\n" % (k, v)
     return text
 
+
 def svk_feature_to_revision_id(feature):
     """Create a revision id from a svk feature identifier.
 
@@ -159,6 +160,7 @@
         self.transport = transport
         self.uuid = transport.get_uuid()
         self.base = transport.base
+        self._serializer = None
         self.dir_cache = {}
         self.scheme = bzrdir.scheme
         self.pool = Pool()

=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py	2007-05-18 16:49:29 +0000
+++ b/tests/test_commit.py	2007-05-18 17:37:05 +0000
@@ -368,20 +368,19 @@
     def test_bind(self):
         repos_url = self.make_client("d", "sc")
         master_branch = Branch.open(repos_url)
-        local_bzrdir = BzrDir.create(".")
-        local_bzrdir.create_repository()
-        local_branch = master_branch.sprout(local_bzrdir)
-        wt = local_bzrdir.create_workingtree()
-        local_branch.bind(master_branch)
+        os.mkdir("b")
+        local_dir = master_branch.bzrdir.sprout("b")
+        wt = local_dir.open_workingtree()
+        local_dir.open_branch().bind(master_branch)
+        local_dir.open_branch().unbind()
 
     def test_commit(self):
         repos_url = self.make_client("d", "sc")
         master_branch = Branch.open(repos_url)
-        local_bzrdir = BzrDir.create(".")
-        local_bzrdir.create_repository()
-        local_branch = master_branch.sprout(local_bzrdir)
-        wt = local_bzrdir.create_workingtree()
-        local_branch.bind(master_branch)
+        os.mkdir("b")
+        local_dir = master_branch.bzrdir.sprout("b")
+        wt = local_dir.open_workingtree()
+        local_dir.open_branch().bind(master_branch)
         self.build_tree({'b/file': 'data'})
         wt.add('file')
         wt.commit(message="Commit from Bzr")