← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_bzrdir/test_bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-18 10:42:07 UTC
  • mfrom: (6437.3.6 2.5)
  • mto: (6437.3.7 2.5)
  • mto: This revision was merged to the branch mainline in revision 6441.
  • Revision ID: jelmer@vernstok.nl-20120118104207-yc5fhsaz4mupjcam
Merge 2.5 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_bzrdir/test_bzrdir.py
693
693
            raise TestNotApplicable('Format does not support colocation')
694
694
        reference = branch.BranchReferenceFormat().initialize(
695
695
            repo.bzrdir, target_branch=target_branch)
696
 
        self.assertEqual(set([None, 'foo']),
 
696
        self.assertEqual(set(["", 'foo']),
697
697
                         set(repo.bzrdir.get_branches().keys()))