/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/diff.py

  • Committer: John Arbash Meinel
  • Date: 2008-09-02 18:37:02 UTC
  • mfrom: (3678 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3680.
  • Revision ID: john@arbash-meinel.com-20080902183702-16cpowcusfvo7rpv
Merge bzr.dev 3678, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
682
682
                 path_encoding='utf-8'):
683
683
        DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
684
684
        self.command_template = command_template
685
 
        self._root = tempfile.mkdtemp(prefix='bzr-diff-')
 
685
        self._root = osutils.mkdtemp(prefix='bzr-diff-')
686
686
 
687
687
    @classmethod
688
688
    def from_string(klass, command_string, old_tree, new_tree, to_file,