← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

  • Committer: Robert Collins
  • Date: 2009-07-20 05:19:53 UTC
  • mto: This revision was merged to the branch mainline in revision 4553.
  • Revision ID: robertc@robertcollins.net-20090720051953-rohq200jtq2vyhhj
Check fileids in inventory deltas are not None and are strings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
1302
1302
            inventory._check_delta_unique_old_paths(
1303
1303
            inventory._check_delta_unique_new_paths(
1304
1304
            inventory._check_delta_ids_match_entry(
1305
 
            inventory._check_delta_new_path_entry_both_or_None(delta)))),
 
1305
            inventory._check_delta_ids_are_valid(
 
1306
            inventory._check_delta_new_path_entry_both_or_None(delta))))),
1306
1307
            reverse=True):
1307
1308
            if (file_id in insertions) or (file_id in removals):
1308
1309
                raise errors.InconsistentDelta(old_path or new_path, file_id,