← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

  • Committer: Jelmer Vernooij
  • Date: 2011-09-06 09:51:45 UTC
  • mto: This revision was merged to the branch mainline in revision 6138.
  • Revision ID: jelmer@samba.org-20110906095145-v9vkxqyjkh3f153r
https://launchpad.net/bugs/187342
"bzr add" warns about nested trees that are skipped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
746
746
                # which is perhaps reasonable: adding a new reference is a
747
747
                # special operation and can have a special behaviour.  mbp
748
748
                # 20070306
749
 
                trace.mutter("%r is a nested bzr tree", abspath)
 
749
                trace.warning("skipping nested tree %r", abspath)
750
750
            else:
751
 
                this_ie = self._add_one_and_parent(parent_ie, directory, kind, inv_path)
 
751
                this_ie = self._add_one_and_parent(parent_ie, directory, kind,
 
752
                    inv_path)
752
753
 
753
754
            if kind == 'directory' and not sub_tree:
754
755
                if this_ie.kind != 'directory':