/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_uncommit.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:17:06 UTC
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610001706-xn6jiuev350246mr
Rename a number of attributes from bzrdir to controldir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_uncommit.py
55
55
 
56
56
    def test_uncommit_bound(self):
57
57
        tree, history = self.make_linear_tree()
58
 
        child = tree.bzrdir.sprout('child').open_workingtree()
 
58
        child = tree.controldir.sprout('child').open_workingtree()
59
59
        child.branch.bind(tree.branch)
60
60
 
61
61
        self.assertEqual(history[1], tree.last_revision())
74
74
 
75
75
    def test_uncommit_bound_local(self):
76
76
        tree, history = self.make_linear_tree()
77
 
        child = tree.bzrdir.sprout('child').open_workingtree()
 
77
        child = tree.controldir.sprout('child').open_workingtree()
78
78
        child.branch.bind(tree.branch)
79
79
 
80
80
        self.assertEqual(history[1], tree.last_revision())
112
112
 
113
113
    def test_uncommit_remove_tags_keeps_pending_merges(self):
114
114
        tree, history = self.make_linear_tree()
115
 
        copy = tree.bzrdir.sprout('copyoftree').open_workingtree()
 
115
        copy = tree.controldir.sprout('copyoftree').open_workingtree()
116
116
        copy.commit(message='merged', rev_id='merged')
117
117
        tree.merge_from_branch(copy.branch)
118
118
        tree.branch.tags.set_tag('pointsatmerged', 'merged')