← 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: Jelmer Vernooij
  • Date: 2012-02-18 16:55:04 UTC
  • mfrom: (6437.23.10 2.5)
  • mto: This revision was merged to the branch mainline in revision 6469.
  • Revision ID: jelmer@samba.org-20120218165504-c9oe5c5ue805y8wp
Merge bzr/2.5.

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.