Merge lp:~songofacandy/bzr-colo/allow-colo-pull-in-subdir into lp:bzr-colo

[methane]

Allow colo-pull in sub directory

=== modified file 'NEWS.txt'
--- NEWS.txt	2011-06-27 03:24:27 +0000
+++ NEWS.txt	2011-08-06 09:29:29 +0000
@@ -5,6 +5,11 @@
 bzr-colo 0.3.1 (in development)
 ###############################
 
+Bug Fixes
+---------
+
+* Allow colo-pull in sub directory of a branch.
+
 
 bzr-colo 0.3.0
 ##############
 
=== modified file 'commands.py'
--- commands.py	2011-05-29 02:25:35 +0000
+++ commands.py	2011-08-06 09:29:29 +0000
@@ -429,7 +429,7 @@
             result.report(self.outf)
             if name == current:
                 # update the working tree
-                tree = workingtree.WorkingTree.open(directory)
+                tree, _ = workingtree.WorkingTree.open_containing(directory)
                 conflicts = tree.update()
         if conflicts > 0:
             return 1