← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Jelmer Vernooij
  • Date: 2011-08-04 13:30:30 UTC
  • mfrom: (6050 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6052.
  • Revision ID: jelmer@samba.org-20110804133030-uwo00unp8b0n782c
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
52
52
from bzrlib import (
53
53
    debug,
54
54
    errors,
55
 
    revision,
56
55
    trace,
57
56
    tree,
58
57
    ui,
724
723
        if self.specific_files or self.exclude:
725
724
            specific_files = self.specific_files or []
726
725
            for path, old_ie in self.basis_inv.iter_entries():
727
 
                if old_ie.file_id in self.builder.new_inventory:
 
726
                if self.builder.new_inventory.has_id(old_ie.file_id):
728
727
                    # already added - skip.
729
728
                    continue
730
729
                if (is_inside_any(specific_files, path)