← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/check.py

  • Committer: Aaron Bentley
  • Date: 2005-10-24 15:56:15 UTC
  • mfrom: (1185.16.99)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1488.
  • Revision ID: abentley@panoramicfeedback.com-20051024155615-6af1ed78ba9e4f9f
Merge from mpool

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/check.py
128
128
 
129
129
        # check the previous history entry is a parent of this entry
130
130
        if rev.parent_ids:
131
 
            if last_rev_id is None and rev_history_position is not None:
132
 
                # what if the start is a ghost ? i.e. conceptually the 
133
 
                # baz imports
134
 
                raise BzrCheckError("revision {%s} has %d parents, but is the "
135
 
                                    "start of the branch"
136
 
                                    % (rev_id, len(rev.parent_ids)))
137
131
            if last_rev_id is not None:
138
132
                for parent_id in rev.parent_ids:
139
133
                    if parent_id == last_rev_id: