← 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-09 23:04:39 UTC
  • mto: This revision was merged to the branch mainline in revision 4524.
  • Revision ID: robertc@robertcollins.net-20090709230439-vztby1svjthvodkv
Check for missing parents in deltas.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
1605
1605
            # Get the entry - the ensures that file_id, dirname exists and has
1606
1606
            # the right file id.
1607
1607
            entry = self._get_entry(1, file_id, dirname)
 
1608
            if entry[1] is None:
 
1609
                self._changes_aborted = True
 
1610
                raise errors.InconsistentDelta(dirname, file_id,
 
1611
                    "This parent is not present.")
1608
1612
            # Parents of things must be directories
1609
1613
            if entry[1][1][0] != 'd':
1610
1614
                self._changes_aborted = True