← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

test_set_parent_trees_no_content dirstate test now passing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
413
413
            # so we just skip over it
414
414
            # number of fields per dir_entry + number of fields per parent_entry + newline
415
415
            num_parents = len(self._parents)
416
 
            entry_size = 7 + (7 * num_parents) + 1
 
416
            entry_size = 7 + (7 * (num_parents - len(self._ghosts))) + 1
417
417
            expected_field_count = entry_size * self._num_entries
418
418
            # is the file too short ?
419
419
            assert field_count - cur == expected_field_count, \