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

  • Committer: Aaron Bentley
  • Date: 2007-02-06 14:54:06 UTC
  • mto: This revision was merged to the branch mainline in revision 2268.
  • Revision ID: abentley@panoramicfeedback.com-20070206145406-yconkndx4kesw9q3
Trim trailing whitespace

Show diffs side-by-side

added added

removed removed

Lines of Context:
564
564
            try:
565
565
                kind = self.work_tree.kind(file_id)
566
566
                if kind != new_ie.kind:
567
 
                    new_ie = inventory.make_entry(kind, new_ie.name, 
 
567
                    new_ie = inventory.make_entry(kind, new_ie.name,
568
568
                                                  new_ie.parent_id, file_id)
569
569
            except errors.NoSuchFile:
570
570
                pass