[Pkg-bazaar-commits] ./bzr/unstable r175: fix up moving files into branch root

[mbp at sourcefrog.net]

------------------------------------------------------------
revno: 175
committer: mbp at sourcefrog.net
timestamp: Tue 2005-04-05 23:50:26 +1000
message:
  fix up moving files into branch root
modified:
  bzrlib/branch.py
-------------- next part --------------
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2005-04-05 13:46:36 +0000
+++ b/bzrlib/branch.py	2005-04-05 13:50:26 +0000
@@ -765,13 +765,13 @@
         if not isdir(to_abs):
             bailout("destination %r is not a directory" % to_abs)
         if not tree.has_filename(to_name):
-            bailout("destination %r is not a versioned directory" % to_abs)
+            bailout("destination %r not in working directory" % to_abs)
         to_dir_id = inv.path2id(to_name)
         if to_dir_id == None and to_name != '':
             bailout("destination %r is not a versioned directory" % to_name)
         to_dir_ie = inv[to_dir_id]
-        if to_dir_ie.kind != 'directory':
-            bailout("destination %r is not a versioned directory" % to_abs)
+        if to_dir_ie.kind not in ('directory', 'root_directory'):
+            bailout("destination %r is not a directory" % to_abs)
 
         to_idpath = Set(inv.get_idpath(to_dir_id))