← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-01-17 17:21:14 UTC
  • mfrom: (2229.2.5 reserved-ids)
  • Revision ID: pqm@pqm.ubuntu.com-20070117172114-dc75493dad46088c
Ensure reserved ids are never stored

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
 
                if file_id in self.this_tree:
576
 
                    self.tt.delete_contents(trans_id)
 
575
                self.tt.delete_contents(trans_id)
577
576
            file_group = self._dump_conflicts(name, parent_id, file_id, 
578
577
                                              set_version=True)
579
578
            self._raw_conflicts.append(('contents conflict', file_group))