← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Swapped os.path.join for pathjoin everywhere

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
707
707
            if this_parent is not None:
708
708
                this_parent_path = \
709
709
                    fp.get_path(self.tt.get_trans_id(this_parent))
710
 
                this_path = os.path.join(this_parent_path, this_name)
 
710
                this_path = pathjoin(this_parent_path, this_name)
711
711
            else:
712
712
                this_path = "<deleted>"
713
713
            file_id = self.tt.final_file_id(trans_id)
807
807
        import bzrlib.patch
808
808
        temp_dir = mkdtemp(prefix="bzr-")
809
809
        try:
810
 
            new_file = os.path.join(temp_dir, "new")
 
810
            new_file = pathjoin(temp_dir, "new")
811
811
            this = self.dump_file(temp_dir, "this", self.this_tree, file_id)
812
812
            base = self.dump_file(temp_dir, "base", self.base_tree, file_id)
813
813
            other = self.dump_file(temp_dir, "other", self.other_tree, file_id)