[MERGE] ftp transport, dsilver's branch

[Matthieu Moy]

Martin Pool <mbp at sourcefrog.net> writes:

>> === modified file 'NEWS'
>> --- NEWS	
>> +++ NEWS	
>> @@ -1,4 +1,9 @@
>>  bzr development version
>> +
>> +  IMPROVEMENTS:
>> +
>> +    * The ftp transport now tries to reconnect after a temporary
>> +      failure. ftp put is made atomic.
>
> Should also mention that connections are cached and credit yourself and
> Daniel.

Done.

> There are some other lines in NEWS that come up in the diff that seem to
> relate to changes already merged; they can be fixed up in the merge.

I suppose this is comming from the merges from bzr.dev into this
branch.

>> -
>> +        if None in (self.parent, self.new_parent, self.name, self.new_name):
>> +            return False
>>          return (self.parent != self.new_parent or self.name != self.new_name)
>>  
>>      def is_deletion(self, reverse=False):
>
> I'm not sure off hand why None would be  accepted there and should just
> return False - could you add a comment?  (Maybe you got this from
> Aaron?)

or from Daniel (I branched from him since I needed his ftp fixes to
go further). Anyway, I can't answer here!

-- 
Matthieu