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

  • Committer: Jelmer Vernooij
  • Date: 2019-07-27 22:47:49 UTC
  • mfrom: (7377 work)
  • mto: This revision was merged to the branch mainline in revision 7378.
  • Revision ID: jelmer@jelmer.uk-20190727224749-rta5fv1sc4ivy6ko
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_pull.py
33
33
 
34
34
    def test_pull_null(self):
35
35
        tree_a, tree_b, rev_a = self.get_pullable_trees()
36
 
        root_id = tree_a.get_root_id()
 
36
        root_id = tree_a.path2id('')
37
37
        tree_a.pull(tree_b.branch, stop_revision=NULL_REVISION, overwrite=True)
38
 
        self.assertEqual(root_id, tree_a.get_root_id())
 
38
        self.assertEqual(root_id, tree_a.path2id(''))
39
39
 
40
40
    def test_pull(self):
41
41
        tree_a, tree_b, rev_a = self.get_pullable_trees()
66
66
        tree.add(['file'])
67
67
        tree.commit('first')
68
68
        to_tree = tree.controldir.sprout('to').open_workingtree()
69
 
        self.assertEqual(b'first_root_id', to_tree.get_root_id())
 
69
        self.assertEqual(b'first_root_id', to_tree.path2id(''))
70
70
        tree.set_root_id(b'second_root_id')
71
71
        tree.commit('second')
72
72
        to_tree.pull(tree.branch)
73
 
        self.assertEqual(b'second_root_id', to_tree.get_root_id())
 
73
        self.assertEqual(b'second_root_id', to_tree.path2id(''))
74
74
 
75
75
 
76
76
class TestPullWithOrphans(per_workingtree.TestCaseWithWorkingTree):