← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
63
63
        wtx = self.make_branch_and_tree('x')
64
64
        base_rev = wtx.commit('common parent')
65
65
        bx = wtx.branch
 
66
        wtx.commit('establish root id')
66
67
        wty = wtx.bzrdir.sprout('y').open_workingtree()
 
68
        self.assertEqual(wtx.get_root_id(), wty.get_root_id())
67
69
        by = wty.branch
68
70
 
69
71
        self.build_tree(['x/ecks', 'y/why'])