/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

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
572
572
            parent_id = self.tt.final_parent(trans_id)
573
573
            if file_id in self.this_tree.inventory:
574
574
                self.tt.unversion_file(trans_id)
575
 
                self.tt.delete_contents(trans_id)
 
575
                if file_id in self.this_tree:
 
576
                    self.tt.delete_contents(trans_id)
576
577
            file_group = self._dump_conflicts(name, parent_id, file_id, 
577
578
                                              set_version=True)
578
579
            self._raw_conflicts.append(('contents conflict', file_group))