[MERGE] Switch nick too

[Rob Weir]

On 21 Jul 2008, Marius Kruger wrote:
> I've been using `bzr switch` a bit recently, and I'm thinking
> it will be nice if it will update the branch's nick too
> to be the nick of the new branch we're binding to.
> It makes sense if you use a checkout as a working branch
> and switch between other local branches for current work.

Great - lightweight checkouts already work like this, so it would be
good to make regular ones consistent.

> === modified file 'bzrlib/tests/blackbox/test_switch.py'
> --- bzrlib/tests/blackbox/test_switch.py	2008-03-03 11:35:47 +0000
> +++ bzrlib/tests/blackbox/test_switch.py	2008-07-20 18:29:25 +0000
> @@ -49,8 +49,19 @@
>          self.assertContainsRe(err, 'Switched to branch: .*/branch2.\n')
>          self.assertEqual('', out)
>  
> +    def test_switch_nick(self):
> +        """Check that the nick gets switched too."""
> +        tree1 = self.make_branch_and_tree('branch1')
> +        #tree1.commit('foo')
> +        tree2 = self.make_branch_and_tree('branch2')
> +        tree2.pull(tree1.branch)
> +        #branch2_id = tree2.commit('bar')

If the commented lines aren't needed, maybe just remove them for clarity?

-- 
-rob