← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Patch Queue Manager
  • Date: 2012-02-18 17:24:52 UTC
  • mfrom: (6468.1.1 merge-2.5)
  • Revision ID: pqm@pqm.ubuntu.com-20120218172452-x7mk642v7mwxtyo1
(jelmer) Merge the 2.5 branch. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_switch.py
191
191
        revid2 = tree.commit('rev2')
192
192
        self.run_bzr(['switch', '-b', 'anotherbranch'])
193
193
        self.assertEquals(
194
 
            ['', 'anotherbranch'],
195
 
            tree.branch.bzrdir.get_branches().keys())
 
194
            set(['', 'anotherbranch']),
 
195
            set(tree.branch.bzrdir.get_branches().keys()))
196
196
 
197
197
    def test_switch_into_unrelated_colocated(self):
198
198
        # Create a new colocated branch from an existing non-colocated branch.