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

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 23:15:15 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7183.
  • Revision ID: jelmer@jelmer.uk-20181116231515-zqd2yn6kj8lfydyp
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_revert.py
26
26
        """Reverting a merge that adds a directory deletes the directory"""
27
27
        source_tree = self.make_branch_and_tree('source')
28
28
        source_tree.commit('empty tree')
29
 
        target_tree = source_tree.controldir.sprout('target').open_workingtree()
 
29
        target_tree = source_tree.controldir.sprout(
 
30
            'target').open_workingtree()
30
31
        self.build_tree(['source/dir/', 'source/dir/contents'])
31
32
        source_tree.add(['dir', 'dir/contents'], [b'dir-id', b'contents-id'])
32
33
        source_tree.commit('added dir')
53
54
        """
54
55
        tree = self.make_branch_and_tree('tree')
55
56
        tree.commit('empty tree')
56
 
        merge_target = tree.controldir.sprout('merge_target').open_workingtree()
 
57
        merge_target = tree.controldir.sprout(
 
58
            'merge_target').open_workingtree()
57
59
        self.build_tree(['tree/new_file'])
58
60
 
59
61
        # newly-added files should not be deleted