← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_core.py

  • Committer: Robert Collins
  • Date: 2005-09-27 07:24:40 UTC
  • mfrom: (1185.1.41)
  • Revision ID: robertc@robertcollins.net-20050927072440-1bf4d99c3e1db5b3
pair programming worx... merge integration and weave

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_core.py
1
1
import changeset
2
2
from changeset import Inventory, apply_changeset, invert_dict
3
3
import os.path
4
 
from osutils import backup_file
 
4
from osutils import backup_file, rename
5
5
from merge3 import Merge3
6
6
 
7
7
class ApplyMerge3:
51
51
        output_file.close()
52
52
        if not new_conflicts:
53
53
            os.chmod(new_file, os.stat(filename).st_mode)
54
 
            os.rename(new_file, filename)
 
54
            rename(new_file, filename)
55
55
            return
56
56
        else:
57
57
            conflict_handler.merge_conflict(new_file, filename, base_lines,