~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Gary van der Merwe
  • Date: 2009-12-03 07:36:17 UTC
  • mto: This revision was merged to the branch mainline in revision 4862.
  • Revision ID: garyvdm@gmail.com-20091203073617-hymf9ydv4wgvebuv
Still write temp file for working tree is force_temp is true. (Suggestion from jam.)

Show diffs side-by-side

added added

removed removed

Lines of Context:
724
724
 
725
725
    def _write_file(self, file_id, tree, prefix, relpath, force_temp=False,
726
726
                    allow_write=False):
727
 
        if isinstance(tree, WorkingTree):
 
727
        if not force_temp and isinstance(tree, WorkingTree):
728
728
            return tree.abspath(tree.id2path(file_id))
729
729
        
730
730
        full_path = osutils.pathjoin(self._root, prefix, relpath)