← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.py

  • Committer: Aaron Bentley
  • Date: 2007-03-16 15:14:40 UTC
  • mto: This revision was merged to the branch mainline in revision 2389.
  • Revision ID: abentley@panoramicfeedback.com-20070316151440-kwqaumvxjcyiurv2
Change bundle reader and merge directive to both be 'mergeables'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
25
25
    osutils,
26
26
    )
27
27
import bzrlib.errors
 
28
from bzrlib.bundle import apply_bundle
28
29
from bzrlib.errors import (TestamentMismatch, BzrError, 
29
30
                           MalformedHeader, MalformedPatches, NotABundle)
30
31
from bzrlib.inventory import (Inventory, InventoryEntry,
432
433
                        ' (unrecognized action): %r' % action_line)
433
434
            valid_actions[action](kind, extra, lines)
434
435
 
 
436
    def get_target_revision(self, target_repo):
 
437
        apply_bundle.install_bundle(target_repo, self)
 
438
        return self.target
 
439
 
 
440
 
 
441
 
435
442
 
436
443
class BundleTree(Tree):
437
444
    def __init__(self, base_tree, revision_id):