← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Arbash Meinel
  • Date: 2009-07-06 21:13:30 UTC
  • mto: This revision was merged to the branch mainline in revision 4522.
  • Revision ID: john@arbash-meinel.com-20090706211330-kwyrjqhhzdo415st
Add some tests that we can handle doing annotations even when
one of the parents doesn't have the object as a file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
489
489
                if file_id not in parent_tree:
490
490
                    continue
491
491
                ie = parent_tree.inventory[file_id]
 
492
                if ie.kind != 'file':
 
493
                    # Note: this is slightly unnecessary, because symlinks and
 
494
                    # directories have a "text" which is the empty text, and we
 
495
                    # know that won't mess up annotations. But it seems cleaner
 
496
                    continue
492
497
                parent_text_key = (file_id, ie.revision)
493
498
                if parent_text_key not in maybe_file_parent_keys:
494
499
                    maybe_file_parent_keys.append(parent_text_key)