← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: mbp at sourcefrog
  • Date: 2005-04-05 13:50:26 UTC
  • Revision ID: mbp@sourcefrog.net-20050405135026-903a3ca2e772a17c2974298d
fix up moving files into branch root

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
765
765
        if not isdir(to_abs):
766
766
            bailout("destination %r is not a directory" % to_abs)
767
767
        if not tree.has_filename(to_name):
768
 
            bailout("destination %r is not a versioned directory" % to_abs)
 
768
            bailout("destination %r not in working directory" % to_abs)
769
769
        to_dir_id = inv.path2id(to_name)
770
770
        if to_dir_id == None and to_name != '':
771
771
            bailout("destination %r is not a versioned directory" % to_name)
772
772
        to_dir_ie = inv[to_dir_id]
773
 
        if to_dir_ie.kind != 'directory':
774
 
            bailout("destination %r is not a versioned directory" % to_abs)
 
773
        if to_dir_ie.kind not in ('directory', 'root_directory'):
 
774
            bailout("destination %r is not a directory" % to_abs)
775
775
 
776
776
        to_idpath = Set(inv.get_idpath(to_dir_id))
777
777