← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_bound_branches.py

resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_bound_branches.py
337
337
 
338
338
        child_tree.merge_from_branch(other_branch)
339
339
 
340
 
        self.failUnlessExists('child/c')
 
340
        self.assertPathExists('child/c')
341
341
        self.assertEqual([new_rev_id], child_tree.get_parent_ids()[1:])
342
342
 
343
343
        # Make sure the local branch has the installed revision