← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Martin
  • Date: 2011-05-21 16:29:38 UTC
  • mto: This revision was merged to the branch mainline in revision 5907.
  • Revision ID: gzlist@googlemail.com-20110521162938-1vrw3hp0197l3vrl
Add tests for non-ascii conflict serialisation

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,
55
56
    trace,
56
57
    tree,
57
58
    ui,
723
724
        if self.specific_files or self.exclude:
724
725
            specific_files = self.specific_files or []
725
726
            for path, old_ie in self.basis_inv.iter_entries():
726
 
                if self.builder.new_inventory.has_id(old_ie.file_id):
 
727
                if old_ie.file_id in self.builder.new_inventory:
727
728
                    # already added - skip.
728
729
                    continue
729
730
                if (is_inside_any(specific_files, path)