← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-03 02:53:36 UTC
  • mfrom: (4241.2.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090403025336-d79qe56jy4bkhpx9
tree tweaks from brisbane-core

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
905
905
            output. An unversioned file is defined as one with (False, False)
906
906
            for the versioned pair.
907
907
        """
908
 
        result = []
909
908
        lookup_trees = [self.source]
910
909
        if extra_trees:
911
910
             lookup_trees.extend(extra_trees)
977
976
                if (self.source.get_symlink_target(file_id) !=
978
977
                    self.target.get_symlink_target(file_id)):
979
978
                    changed_content = True
 
979
                # XXX: Yes, the indentation below is wrong. But fixing it broke
 
980
                # test_merge.TestMergerEntriesLCAOnDisk.
 
981
                # test_nested_tree_subtree_renamed_and_modified. We'll wait for
 
982
                # the fix from bzr.dev -- vila 2009026
980
983
                elif from_kind == 'tree-reference':
981
984
                    if (self.source.get_reference_revision(file_id, from_path)
982
985
                        != self.target.get_reference_revision(file_id, to_path)):