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

  • Committer: Jelmer Vernooij
  • Date: 2017-08-10 00:51:26 UTC
  • mfrom: (6747.3.1 avoid-set-revid-2)
  • Revision ID: jelmer@jelmer.uk-20170810005126-pmeq8y51dax20svq
Merge lp:~jelmer/brz/avoid-set-revid-2

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_merge_from_branch.py
86
86
        tree_a = self.make_branch_and_tree('tree_a')
87
87
        self.build_tree_contents([('tree_a/file', 'text-a')])
88
88
        tree_a.add('file')
89
 
        tree_a.commit('added file', rev_id='rev_1')
 
89
        rev1 = tree_a.commit('added file')
90
90
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
91
91
        os.unlink('tree_a/file')
92
92
        tree_a.commit('deleted file')
94
94
        tree_b.commit('changed file')
95
95
        self.assertRaises(errors.PointlessMerge, tree_a.merge_from_branch,
96
96
            tree_b.branch, from_revision=tree_b.branch.last_revision())
97
 
        tree_a.merge_from_branch(tree_b.branch, from_revision='rev_1')
 
97
        tree_a.merge_from_branch(tree_b.branch, from_revision=rev1)
98
98
        tree_a.lock_read()
99
99
        self.addCleanup(tree_a.unlock)
100
100
        changes = list(tree_a.iter_changes(tree_a.basis_tree()))