/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/merge.py

  • Committer: Martin Pool
  • Date: 2005-08-05 20:17:17 UTC
  • Revision ID: mbp@sourcefrog.net-20050805201717-959807d65bcd0ccd
- add better handler for new_contents_conflict collision

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
87
87
        os.rename(new_file, this_path)
88
88
        self.conflict("Diff3 conflict encountered in %s" % this_path)
89
89
 
 
90
    def new_contents_conflict(self, filename, other_contents):
 
91
        """Conflicting contents for newly added file."""
 
92
        self.copy(other_contents, filename + ".OTHER")
 
93
        self.conflict("Conflict in newly added file %s" % filename)
 
94
    
 
95
 
90
96
    def target_exists(self, entry, target, old_path):
91
97
        """Handle the case when the target file or dir exists"""
92
98
        moved_path = self.add_suffix(target, ".moved")