← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Jelmer Vernooij
  • Date: 2011-01-13 01:32:26 UTC
  • mfrom: (5606 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5607.
  • Revision ID: jelmer@samba.org-20110113013226-1d41bwtmps9y68wm
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
27
27
    inventory,
28
28
    merge,
29
29
    osutils,
30
 
    repository,
31
30
    revision as _mod_revision,
32
31
    tests,
33
32
    treebuilder,
35
34
from bzrlib.bundle import read_mergeable_from_url
36
35
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
37
36
from bzrlib.bundle.bundle_data import BundleTree
38
 
from bzrlib.bzrdir import BzrDir
39
37
from bzrlib.directory_service import directories
40
38
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
41
39
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
42
40
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
43
41
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
44
 
from bzrlib.branch import Branch
45
42
from bzrlib.repofmt import knitrepo
46
43
from bzrlib.tests import (
47
44
    test_read_bundle,