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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-11-19 19:46:23 UTC
  • mfrom: (7524.2.5 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20201119194623-5tfi4z6ktdzo0z3y
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/394038

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_transform.py
61
61
    create_from_tree,
62
62
    FinalPaths,
63
63
    resolve_conflicts,
64
 
    resolve_checkout,
65
64
    ROOT_PARENT,
66
65
    ImmortalLimbo,
67
66
    MalformedTransform,
71
70
)
72
71
 
73
72
from breezy.bzr.inventorytree import InventoryTreeChange
 
73
from breezy.bzr.transform import resolve_checkout
74
74
 
75
75
from breezy.tests.per_workingtree import TestCaseWithWorkingTree
76
76