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

  • Committer: Jelmer Vernooij
  • Date: 2019-06-29 13:16:26 UTC
  • mto: This revision was merged to the branch mainline in revision 7376.
  • Revision ID: jelmer@jelmer.uk-20190629131626-qioafloyemhdbm4w
Remove Tree.get_root_id() in favour of Tree.path2id('').

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge.py
137
137
        with merger.make_preview_transform() as tt:
138
138
            self.assertEqual([], tt.find_conflicts())
139
139
            preview = tt.get_preview_tree()
140
 
            self.assertEqual(wt.get_root_id(), preview.get_root_id())
 
140
            self.assertEqual(wt.path2id(''), preview.path2id(''))
141
141
 
142
142
    def test_merge_unrelated_retains_root(self):
143
143
        wt = self.make_branch_and_tree('tree')
149
149
        with transform.TransformPreview(wt) as merger.tt:
150
150
            merger._compute_transform()
151
151
            new_root_id = merger.tt.final_file_id(merger.tt.root)
152
 
            self.assertEqual(wt.get_root_id(), new_root_id)
 
152
            self.assertEqual(wt.path2id(''), new_root_id)
153
153
 
154
154
    def test_create_rename(self):
155
155
        """Rename an inventory entry while creating the file"""
511
511
        self.build_tree(['a'])
512
512
        tree.add('a')
513
513
        first_rev = tree.commit("added a")
514
 
        old_root_id = tree.get_root_id()
 
514
        old_root_id = tree.path2id('')
515
515
        merger = _mod_merge.Merger.from_revision_ids(tree,
516
516
                                                     _mod_revision.NULL_REVISION,
517
517
                                                     first_rev)