← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/commands.py

  • Committer: John Arbash Meinel
  • Date: 2007-06-28 23:18:09 UTC
  • mfrom: (2562 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2566.
  • Revision ID: john@arbash-meinel.com-20070628231809-pqbt7puoqj8bl07b
[merge] bzr.dev 2562

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/commands.py
27
27
from bzrlib import (
28
28
    branch,
29
29
    errors,
 
30
    revision as _mod_revision,
30
31
    urlutils,
31
32
    )
32
 
from bzrlib.revision import common_ancestor
33
33
""")
34
34
 
35
35
from bzrlib.commands import Command
155
155
                                                 ' to be specified.')
156
156
            target_branch.repository.fetch(base_branch.repository, 
157
157
                                           base_branch.last_revision())
158
 
            base_revision = common_ancestor(base_branch.last_revision(),
159
 
                                            target_revision,
160
 
                                            target_branch.repository)
161
 
 
 
158
            graph = target_branch.repository.get_graph()
 
159
            base_revision = graph.find_unique_lca(
 
160
                _mod_revision.ensure_null(base_branch.last_revision()),
 
161
                _mod_revision.ensure_null(target_revision))
162
162
 
163
163
        if output is not None:
164
164
            fileobj = file(output, 'wb')