/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 breezy/tests/test_transform.py

  • Committer: Jelmer Vernooij
  • Date: 2020-08-10 15:00:17 UTC
  • mfrom: (7490.40.99 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200810150017-vs7xnrd1vat4iktg
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
36
36
from ..bzr import (
37
37
    generate_ids,
38
38
    )
39
 
from ..conflicts import (
 
39
from ..bzr.conflicts import (
40
40
    DeletingParent,
41
41
    DuplicateEntry,
42
42
    DuplicateID,
72
72
from ..transform import (
73
73
    build_tree,
74
74
    create_from_tree,
75
 
    cook_conflicts,
76
75
    _FileMover,
77
76
    FinalPaths,
78
77
    resolve_conflicts,
1414
1413
        tt.delete_contents(dir_tid)
1415
1414
        tt.unversion_file(dir_tid)
1416
1415
        # There should be a conflict because dir still contain foo
1417
 
        raw_conflicts = tt.find_conflicts()
 
1416
        raw_conflicts = tt.find_raw_conflicts()
1418
1417
        self.assertLength(1, raw_conflicts)
1419
1418
        self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
1420
1419
        return tt, orphan_tid