← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin Packman
  • Date: 2011-10-21 15:58:51 UTC
  • mfrom: (6228 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6229.
  • Revision ID: martin.packman@canonical.com-20111021155851-9wkw8u5okyq2l79q
Merge bzr.dev to resolve release notes conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
884
884
        if len(names_list) < 2:
885
885
            raise errors.BzrCommandError(gettext("missing file argument"))
886
886
        tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
 
887
        for file_name in rel_names[0:-1]:
 
888
            if file_name == '':
 
889
                raise errors.BzrCommandError(gettext("can not move root of branch"))
887
890
        self.add_cleanup(tree.lock_tree_write().unlock)
888
891
        self._run(tree, names_list, rel_names, after)
889
892