~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: 2011-11-04 20:08:30 UTC
  • mto: This revision was merged to the branch mainline in revision 6276.
  • Revision ID: jelmer@samba.org-20111104200830-9oby08sxzdikw0pu
bzr switch can now switch to colocated branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
175
175
        otherbranch = tree.bzrdir.create_branch(name='anotherbranch')
176
176
        otherbranch.generate_revision_history(revid1)
177
177
        self.run_bzr(['switch', 'anotherbranch'], working_dir='branch-1')
 
178
        tree = WorkingTree.open("branch-1")
178
179
        self.assertEquals(tree.last_revision(), revid1)
179
 
        self.assertEquals(tree.branch, otherbranch)
 
180
        self.assertEquals(tree.branch.control_url, otherbranch.control_url)
180
181
 
181
182
    def test_switch_only_revision(self):
182
183
        tree = self._create_sample_tree()