← 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-19 21:22:56 UTC
  • mfrom: (2490.2.29 graphwalker)
  • Revision ID: pqm@pqm.ubuntu.com-20070619212256-y1148bn5gf4jg2dh
[MERGE] handle null revision properly for LCA

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
33
""")
156
157
                                           base_branch.last_revision())
157
158
            graph = target_branch.repository.get_graph()
158
159
            base_revision = graph.find_unique_lca(
159
 
                base_branch.last_revision(), target_revision)
 
160
                _mod_revision.ensure_null(base_branch.last_revision()),
 
161
                _mod_revision.ensure_null(target_revision))
160
162
 
161
163
        if output is not None:
162
164
            fileobj = file(output, 'wb')