/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: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with 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,