[merge] FTP now has and passes regression tests

[John A Meinel]

Robert Collins wrote:


>>
>> plain text document attachment (ftp-server-test.diff)
>> === modified file 'NEWS'
>> --- NEWS	
>> +++ NEWS	
>> @@ -2,19 +2,23 @@
>>  
>>    IMPROVEMENTS:

NEWS needed to be re-indented to line up with all of the other NEWS entries.

>>
>>  bzr 0.8  2006-05-08
>>
>> === modified file 'bzrlib/repository.py'
>> --- bzrlib/repository.py	
>> +++ bzrlib/repository.py	
>> @@ -1308,7 +1308,7 @@
>>                         repository.
>>          """
>>          mutter('creating repository in %s.', a_bzrdir.transport.base)
>> -        dirs = ['knits']
>> +        dirs = ['revision-store', 'knits']
>>          files = []
>>          utf8_files = [('format', self.get_format_string())]
> 

We shouldn't be creating 'revision-store' here (you can see that we have
a spurious .bzr/repository/revision-store/ directory in our trees. But
this shouldn't be in this patch.

> 
> How did you create the diff? It seems to have lots of noise in it.
> 
> If you could make a cleaner diff that would be great.
> 
> Rob


There were a few other changes that helped track down the problems. But
I've attached a new patch.

John
=:->
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: ftp-changes.diff
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20060518/a58056eb/attachment.diff 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060518/a58056eb/attachment.pgp