← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2005-09-23 09:25:16 UTC
  • mto: (1092.3.4)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: robertc@robertcollins.net-20050923092516-e2c3c0f31288669d
Merge what applied of Alexander Belchenko's win32 patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
84
84
            last_new_name = name
85
85
        new_name = last_new_name+suffix
86
86
        try:
87
 
            os.rename(name, new_name)
 
87
            rename(name, new_name)
88
88
            return new_name
89
89
        except OSError, e:
90
90
            if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY:
108
108
        self.add_suffix(this_path, ".THIS")
109
109
        self.dump(base_lines, this_path+".BASE")
110
110
        self.dump(other_lines, this_path+".OTHER")
111
 
        os.rename(new_file, this_path)
 
111
        rename(new_file, this_path)
112
112
        self.conflict("Diff3 conflict encountered in %s" % this_path)
113
113
 
114
114
    def new_contents_conflict(self, filename, other_contents):