← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-06-18 21:07:10 UTC
  • mfrom: (2490.2.27 graphwalker)
  • Revision ID: pqm@pqm.ubuntu.com-20070618210710-6y8wzcqiw2kvxdiy
Better merge base selection and graph API

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
211
211
        else:
212
212
            submit_revision_id = submit_branch.last_revision()
213
213
            repository.fetch(submit_branch.repository, submit_revision_id)
214
 
            ancestor_id = _mod_revision.common_ancestor(revision_id,
215
 
                                                        submit_revision_id,
216
 
                                                        repository)
 
214
            graph = repository.get_graph()
 
215
            ancestor_id = graph.find_unique_lca(revision_id,
 
216
                                                submit_revision_id)
217
217
            type_handler = {'bundle': klass._generate_bundle,
218
218
                            'diff': klass._generate_diff,
219
219
                            None: lambda x, y, z: None }