← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_branch.py

  • Committer: Andrew Bennetts
  • Date: 2010-12-14 23:14:44 UTC
  • mfrom: (5569 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5570.
  • Revision ID: andrew.bennetts@canonical.com-20101214231444-uubf7zjbg8q92ocs
Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_branch.py
187
187
        self.assertEqual(branch_b.get_parent(), branch_c.get_parent())
188
188
 
189
189
        # We can also set a specific parent, and it should be honored
190
 
        random_parent = 'http://bazaar-vcs.org/path/to/branch'
 
190
        random_parent = 'http://example.com/path/to/branch'
191
191
        branch_b.set_parent(random_parent)
192
192
        repo_d = self.make_repository('d')
193
193
        branch_b.repository.copy_content_into(repo_d)