[MERGE] Two bug fixes

[Martin Pool]

On  7 Mar 2006, Michael Ellerman <michael at ellerman.id.au> wrote:
> On Mon, 6 Mar 2006 20:41, Robert Collins wrote:
> > On Mon, 2006-03-06 at 11:55 +1100, Michael Ellerman wrote:
> > > Hi folks,
> > >
> > > There's two bug fixes (#3452 and #32587) sitting on top of my random
> > > stuff branch at:
> > >
> > > http://michael.ellerman.id.au/files/bzr/mpe
> >
> > Can you throw a patch-style-patch at me ?
> 
> First fix is just:
> 
> === modified file 'a/bzrlib/tests/test_config.py'
> --- a/bzrlib/tests/test_config.py
> +++ b/bzrlib/tests/test_config.py
> @@ -542,8 +542,6 @@
>                           self.my_config.post_commit())
> 
> 
> -class TestLocationConfig(TestCaseInTempDir):
> -
>      def get_location_config(self, location, global_config=None):
>          if global_config is None:
>              global_file = StringIO(sample_config_text)

I may have already fixed this by hand; in any case +1 to merging them
both.

-- 
Martin