← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/commands.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/bundle/commands.py
29
29
    errors,
30
30
    urlutils,
31
31
    )
32
 
from bzrlib.revision import common_ancestor
33
32
""")
34
33
 
35
34
from bzrlib.commands import Command
155
154
                                                 ' to be specified.')
156
155
            target_branch.repository.fetch(base_branch.repository, 
157
156
                                           base_branch.last_revision())
158
 
            base_revision = common_ancestor(base_branch.last_revision(),
159
 
                                            target_revision,
160
 
                                            target_branch.repository)
161
 
 
 
157
            graph = target_branch.repository.get_graph()
 
158
            base_revision = graph.find_unique_lca(
 
159
                base_branch.last_revision(), target_revision)
162
160
 
163
161
        if output is not None:
164
162
            fileobj = file(output, 'wb')