← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Robert Collins
  • Date: 2006-03-21 12:41:37 UTC
  • mfrom: (1616 +trunk)
  • mto: (1666.1.5 integration)
  • mto: This revision was merged to the branch mainline in revision 1622.
  • Revision ID: robertc@robertcollins.net-20060321124137-b9028b082c63d99d
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1469
1469
            w = Weave(file_id)
1470
1470
            self.text_weaves[file_id] = w
1471
1471
        text_changed = False
1472
 
        previous_entries = ie.find_previous_heads(parent_invs, w)
 
1472
        previous_entries = ie.find_previous_heads(parent_invs,
 
1473
                                                  None,
 
1474
                                                  None,
 
1475
                                                  entry_vf=w)
1473
1476
        for old_revision in previous_entries:
1474
1477
                # if this fails, its a ghost ?
1475
1478
                assert old_revision in self.converted_revs