← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Robert Collins
  • Date: 2006-03-07 12:17:32 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060307121732-1a219b872ef18ecc
cleanup deprecation warnings and finish conversion so the inventory is knit based too.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
214
214
 
215
215
        Weave lines present in none of them are skipped entirely.
216
216
        """
217
 
        inc_a = set(self.inclusions([ver_a]))
218
 
        inc_b = set(self.inclusions([ver_b]))
 
217
        inc_a = set(self.get_ancestry([ver_a]))
 
218
        inc_b = set(self.get_ancestry([ver_b]))
219
219
        inc_c = inc_a & inc_b
220
220
 
221
221
        for lineno, insert, deleteset, line in self.walk():