/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/tests/per_repository_vf/test_reconcile.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 
17
17
"""Tests for reconciliation of repositories."""
18
18
 
19
 
import bzrlib
20
 
from bzrlib import (
 
19
import breezy
 
20
from breezy import (
21
21
    errors,
22
22
    )
23
 
from bzrlib.bzrdir import BzrDir
24
 
from bzrlib.inventory import Inventory
25
 
from bzrlib.reconcile import reconcile, Reconciler
26
 
from bzrlib.revision import Revision
27
 
from bzrlib.tests import TestSkipped
 
23
from breezy.bzrdir import BzrDir
 
24
from breezy.inventory import Inventory
 
25
from breezy.reconcile import reconcile, Reconciler
 
26
from breezy.revision import Revision
 
27
from breezy.tests import TestSkipped
28
28
 
29
 
from bzrlib.tests.per_repository_vf.helpers import (
 
29
from breezy.tests.per_repository_vf.helpers import (
30
30
    TestCaseWithBrokenRevisionIndex,
31
31
    )
32
 
from bzrlib.tests.per_repository_vf import (
 
32
from breezy.tests.per_repository_vf import (
33
33
    TestCaseWithRepository,
34
34
    all_repository_vf_format_scenarios,
35
35
    )
36
 
from bzrlib.tests.matchers import MatchesAncestry
37
 
from bzrlib.tests.scenarios import load_tests_apply_scenarios
38
 
from bzrlib.uncommit import uncommit
 
36
from breezy.tests.matchers import MatchesAncestry
 
37
from breezy.tests.scenarios import load_tests_apply_scenarios
 
38
from breezy.uncommit import uncommit
39
39
 
40
40
 
41
41
load_tests = load_tests_apply_scenarios
108
108
            root_id = inv.root.file_id
109
109
            sha1 = repo.add_inventory(revision_id, inv, parent_ids)
110
110
            repo.texts.add_lines((root_id, revision_id), [], [])
111
 
            rev = bzrlib.revision.Revision(timestamp=0,
 
111
            rev = breezy.revision.Revision(timestamp=0,
112
112
                                           timezone=None,
113
113
                                           committer="Foo Bar <foo@example.com>",
114
114
                                           message="Message",
302
302
        ie.revision = 'ghostrevid'
303
303
        ie.text_size = 42
304
304
        ie.text_sha1 = "bee68c8acd989f5f1765b4660695275948bf5c00"
305
 
        rev = bzrlib.revision.Revision(timestamp=0,
 
305
        rev = breezy.revision.Revision(timestamp=0,
306
306
                                       timezone=None,
307
307
                                       committer="Foo Bar <foo@example.com>",
308
308
                                       message="Message",