← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

[patch] Aaron Bentley: Merge deletes foo.new

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset.py
401
401
 
402
402
    def apply(self, filename, conflict_handler):
403
403
        import bzrlib.patch
404
 
        temp_dir = mkdtemp(prefix="bzr-")
 
404
        temp_dir = mkdtemp(prefix="bzr-", dir=os.path.dirname(filename))
405
405
        try:
406
 
            new_file = filename+".new"
 
406
            new_file = os.path.join(temp_dir, filename)
407
407
            base_file = self.dump_file(temp_dir, "base", self.base)
408
408
            other_file = self.dump_file(temp_dir, "other", self.other)
409
409
            base = base_file