← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2005-11-17 05:14:54 UTC
  • mto: (1185.65.14 storage)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: aaron.bentley@utoronto.ca-20051117051454-e9ac1dd13766b978
Moved get_ancestry to RevisionStorage

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
471
471
            return
472
472
        if self.other_rev_id is None:
473
473
            return
474
 
        if self.other_rev_id in self.this_branch.get_ancestry(self.this_basis):
 
474
        ancestry = self.this_branch.storage.get_ancestry(self.this_basis)
 
475
        if self.other_rev_id in ancestry:
475
476
            return
476
477
        self.this_branch.add_pending_merge(self.other_rev_id)
477
478