← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Robert Collins
  • Date: 2007-02-06 23:53:30 UTC
  • mfrom: (2268 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2274.
  • Revision ID: robertc@robertcollins.net-20070206235330-2sy67ccuq0ksubqa
Merge HEAD.

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
from bzrlib.branch import Branch
582
583
        for path, new_ie in entries:
583
584
            self._emit_progress_update()
584
585
            file_id = new_ie.file_id
 
586
            try:
 
587
                kind = self.work_tree.kind(file_id)
 
588
                if kind != new_ie.kind:
 
589
                    new_ie = inventory.make_entry(kind, new_ie.name,
 
590
                                                  new_ie.parent_id, file_id)
 
591
            except errors.NoSuchFile:
 
592
                pass
585
593
            # mutter('check %s {%s}', path, file_id)
586
594
            if (not self.specific_files or 
587
595
                is_inside_or_parent_of_any(self.specific_files, path)):