← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-03-26 03:06:52 UTC
  • mfrom: (3287.5.10 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080326030652-vgwdkwda9mi8s200
Deprecate VersionedFile.get_parents. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1401
1401
        """
1402
1402
        if version_id not in self.uncommon:
1403
1403
            return set()
1404
 
        parents = self.vf.get_parents(version_id)
 
1404
        parents = self.vf.get_parent_map([version_id])[version_id]
1405
1405
        if len(parents) == 0:
1406
1406
            return set(range(len(self.vf.get_lines(version_id))))
1407
1407
        new = None