/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-12-03 21:38:07 UTC
  • mto: This revision was merged to the branch mainline in revision 3073.
  • Revision ID: abentley@panoramicfeedback.com-20071203213807-inz8pur6ejnc1ax5
Use topo_sorted=False with get_ancestry

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1152
1152
        self.lines_a = vf.get_lines(a_rev)
1153
1153
        self.lines_b = vf.get_lines(b_rev)
1154
1154
        self.vf = vf
1155
 
        a_ancestry = set(vf.get_ancestry(a_rev))
1156
 
        b_ancestry = set(vf.get_ancestry(b_rev))
 
1155
        a_ancestry = set(vf.get_ancestry(a_rev, topo_sorted=False))
 
1156
        b_ancestry = set(vf.get_ancestry(b_rev, topo_sorted=False))
1157
1157
        self.uncommon = a_ancestry.symmetric_difference(b_ancestry)
1158
1158
        self._last_lines = None
1159
1159
        self._last_lines_revision_id = None