/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/bundle/commands.py

  • Committer: Aaron Bentley
  • Date: 2007-06-19 14:49:06 UTC
  • mto: This revision was merged to the branch mainline in revision 2537.
  • Revision ID: abentley@panoramicfeedback.com-20070619144906-zx160g6h377j729h
Fix handling of null revision

Show diffs side-by-side

added added

removed removed

Lines of Context:
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')