/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/blackbox/test_join.py

  • Committer: Jelmer Vernooij
  • Date: 2019-09-21 17:08:09 UTC
  • mfrom: (7389 work)
  • mto: This revision was merged to the branch mainline in revision 7390.
  • Revision ID: jelmer@jelmer.uk-20190921170809-ejewbeue585deajo
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_join.py
67
67
    def test_join_reference(self):
68
68
        """Join can add a reference if --reference is supplied"""
69
69
        base_tree, sub_tree = self.make_trees()
70
 
        subtree_root_id = sub_tree.get_root_id()
 
70
        subtree_root_id = sub_tree.path2id('')
71
71
        self.run_bzr('join . --reference', working_dir='tree/subtree')
72
72
        sub_tree.lock_read()
73
73
        self.addCleanup(sub_tree.unlock)