/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2007-06-21 03:29:39 UTC
  • mto: This revision was merged to the branch mainline in revision 2542.
  • Revision ID: aaron.bentley@utoronto.ca-20070621032939-kcnl1dmxsixygskb
Disable topological sorting of get_ancestry where sensible

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
201
201
            return
202
202
        if self.other_rev_id is None:
203
203
            return
204
 
        ancestry = self.this_branch.repository.get_ancestry(self.this_basis)
 
204
        ancestry = set(self.this_branch.repository.get_ancestry(
 
205
            self.this_basis, topo_sorted=False))
205
206
        if self.other_rev_id in ancestry:
206
207
            return
207
208
        self.this_tree.add_parent_tree((self.other_rev_id, self.other_tree))