diff -Nru bzr-loom-2.1+bzr148/branch.py bzr-loom-2.1+bzr150/branch.py
--- bzr-loom-2.1+bzr148/branch.py	2011-12-20 15:23:03.000000000 +0000
+++ bzr-loom-2.1+bzr150/branch.py	2012-02-01 14:04:03.000000000 +0000
@@ -780,19 +780,17 @@
     def initialize(self, a_bzrdir, name=None, repository=None,
                    append_revisions_only=None):
         """Create a branch of this format in a_bzrdir."""
-        if name is not None:
-            raise errors.NoColocatedBranchSupport(self)
         if repository is None and append_revisions_only is None:
-            super(LoomFormatMixin, self).initialize(a_bzrdir, name=None)
+            super(LoomFormatMixin, self).initialize(a_bzrdir, name=name)
         elif append_revisions_only is None:
             # The 'repository' optional keyword arg is new in bzr 2.3, so don't
             # pass it unless it was passed in.
-            super(LoomFormatMixin, self).initialize(a_bzrdir, name=None,
+            super(LoomFormatMixin, self).initialize(a_bzrdir, name=name,
                     repository=repository)
         else:
             # The 'append_revisions_only' optional keyword arg is new in bzr 
             # 2.4, so don't  pass it unless it was passed in.
-            super(LoomFormatMixin, self).initialize(a_bzrdir, name=None,
+            super(LoomFormatMixin, self).initialize(a_bzrdir, name=name,
                     repository=repository,
                     append_revisions_only=append_revisions_only)
 
@@ -808,11 +806,11 @@
             branch_transport, 'lock', bzrlib.lockdir.LockDir)
         control_files.lock_write()
         try:
-            for name, stream in files:
-                branch_transport.put_file(name, stream)
+            for filename, stream in files:
+                branch_transport.put_file(filename, stream)
         finally:
             control_files.unlock()
-        return self.open(a_bzrdir, _found=True, )
+        return self.open(a_bzrdir, _found=True, name=name)
 
     def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
             found_repository=None, possible_transports=None):
@@ -822,15 +820,13 @@
                if format probing has already be done.
 
         :param name: The 'colocated branches' name for the branch to open.
-            in future, Loom may use that to return a Thread, but for now
-            it is unused.
         """
+        if name is None:
+            name = a_bzrdir._get_selected_branch()
         if not _found:
-            format = bzrlib.branch.BranchFormat.find_format(a_bzrdir)
+            format = bzrlib.branch.BranchFormat.find_format(a_bzrdir, name=name)
             assert format.__class__ == self.__class__
-        if name is not None:
-            raise errors.NoColocatedBranchSupport(self)
-        transport = a_bzrdir.get_branch_transport(None)
+        transport = a_bzrdir.get_branch_transport(None, name=name)
         control_files = bzrlib.lockable_files.LockableFiles(
             transport, 'lock', bzrlib.lockdir.LockDir)
         if found_repository is None:
@@ -839,7 +835,8 @@
                           _control_files=control_files,
                           a_bzrdir=a_bzrdir,
                           _repository=found_repository,
-                          ignore_fallbacks=ignore_fallbacks)
+                          ignore_fallbacks=ignore_fallbacks,
+                          name=name)
 
     def take_over(self, branch):
         """Take an existing bzrlib branch over into Loom format.
@@ -877,7 +874,8 @@
 
     _parent_classs = bzrlib.branch.BzrBranchFormat5
 
-    def get_format_string(self):
+    @classmethod
+    def get_format_string(cls):
         """See BranchFormat.get_format_string()."""
         return "Bazaar-NG Loom branch format 1\n"
 
@@ -906,7 +904,8 @@
 
     _parent_classs = bzrlib.branch.BzrBranchFormat6
 
-    def get_format_string(self):
+    @classmethod
+    def get_format_string(cls):
         """See BranchFormat.get_format_string()."""
         return "Bazaar-NG Loom branch format 6\n"
 
@@ -935,7 +934,8 @@
 
     _parent_classs = bzrlib.branch.BzrBranchFormat7
 
-    def get_format_string(self):
+    @classmethod
+    def get_format_string(cls):
         """See BranchFormat.get_format_string()."""
         return "Bazaar-NG Loom branch format 7\n"
 
diff -Nru bzr-loom-2.1+bzr148/debian/changelog bzr-loom-2.1+bzr150/debian/changelog
--- bzr-loom-2.1+bzr148/debian/changelog	2011-12-20 15:26:29.000000000 +0000
+++ bzr-loom-2.1+bzr150/debian/changelog	2012-02-08 11:15:29.000000000 +0000
@@ -1,3 +1,9 @@
+bzr-loom (2.1+bzr150-1) unstable; urgency=low
+
+  * New upstream snapshot.
+
+ -- Jelmer Vernooij <jelmer@debian.org>  Wed, 08 Feb 2012 12:13:10 +0100
+
 bzr-loom (2.1+bzr148-1) unstable; urgency=low
 
   [ Max Bowsher ]
diff -Nru bzr-loom-2.1+bzr148/.testr.conf bzr-loom-2.1+bzr150/.testr.conf
--- bzr-loom-2.1+bzr148/.testr.conf	2010-04-20 07:48:35.000000000 +0000
+++ bzr-loom-2.1+bzr150/.testr.conf	2012-02-01 13:51:52.000000000 +0000
@@ -1,4 +1,4 @@
 [DEFAULT]
-# not quite idea, because 'all tests' is too many, and 'just loom' is too few.
-test_command=bzr selftest --subunit $IDOPTION
+test_command=bzr selftest --subunit $IDOPTION $LISTOPT bzrlib.plugins.loom Loom
 test_id_option=--load-list $IDFILE
+test_list_option=--list