/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 processors/generic_processor.py

  • Committer: Ian Clatworthy
  • Date: 2009-02-20 02:34:38 UTC
  • mto: (0.64.124 trunk)
  • mto: This revision was merged to the branch mainline in revision 6631.
  • Revision ID: ian.clatworthy@canonical.com-20090220023438-b1ckd4w2t2iw7if2
file/symlink <-> directory change tests & fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
processors/generic_processor.py
829
829
        # make sure the cache used by get_lines knows that
830
830
        self.lines_for_commit[dir_file_id] = []
831
831
        #print "adding dir for %s" % path
832
 
        self.inventory.add(ie)
 
832
        try:
 
833
            self.inventory.add(ie)
 
834
        except errors.DuplicateFileId:
 
835
            # Directory already exists as a file or symlink
 
836
            del self.inventory[ie.file_id]
 
837
            # Try again
 
838
            self.inventory.add(ie)
833
839
        return basename, ie