/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: Canonical.com Patch Queue Manager
  • Date: 2007-02-06 20:54:42 UTC
  • mfrom: (1959.4.6 typechange)
  • Revision ID: pqm@pqm.ubuntu.com-20070206205442-4a0752247e60cabf
Commit supports kind changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
58
58
 
59
59
from bzrlib import (
60
60
    errors,
 
61
    inventory,
61
62
    tree,
62
63
    )
63
64
import bzrlib.config
560
561
        for path, new_ie in entries:
561
562
            self._emit_progress_update()
562
563
            file_id = new_ie.file_id
 
564
            try:
 
565
                kind = self.work_tree.kind(file_id)
 
566
                if kind != new_ie.kind:
 
567
                    new_ie = inventory.make_entry(kind, new_ie.name,
 
568
                                                  new_ie.parent_id, file_id)
 
569
            except errors.NoSuchFile:
 
570
                pass
563
571
            # mutter('check %s {%s}', path, file_id)
564
572
            if (not self.specific_files or 
565
573
                is_inside_or_parent_of_any(self.specific_files, path)):