[MERGE][#299313] --local commits are accessing the network

[Andrew Bennetts]

Marius Kruger wrote:
> 2008/11/25 John Arbash Meinel <john at arbash-meinel.com>
> 
>     I agree that this should be in 1.10 (considering we aren't going to do a
>     1.9.1 anyway). ic?
> 
>     I believe we still need to add Per-branch tests that Branch.get_nick
>     works. I would put them in bzrlib/tests/per_branch/test_get_nick.py
> 
>     If we are making it public then we should have:
>     ...
> 
>  
> In that case we should consider merging the initial bug fix for 1.10 .
> I see that making it public is not so trivial, and I'm afraid it won't be
> ready by Friday. I'll continue to work on it though, and submit a follow-on
> patch.

I agree.  I've checked with Martin and thinks that's fine too, so I've submitted
your previous patch (with _get_nick) as-is, apart from adding a NEWS entry so
that you get some credit for the fix :)

-Andrew.