/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.py

  • Committer: Aaron Bentley
  • Date: 2006-09-26 13:28:39 UTC
  • mto: This revision was merged to the branch mainline in revision 2048.
  • Revision ID: abentley@panoramicfeedback.com-20060926132839-cee32159ab268eeb
Changes from review

Show diffs side-by-side

added added

removed removed

Lines of Context:
578
578
                then be cached.
579
579
        """
580
580
        base_id = self.old_contents_id(file_id)
581
 
        if (base_id is not None and 
 
581
        if (base_id is not None and
582
582
            base_id != self.base_tree.inventory.root.file_id):
583
583
            patch_original = self.base_tree.get_file(base_id)
584
584
        else: