[MERGE] ftp transport, dsilver's branch

[Daniel Silverstone]

On Wed, 2006-02-01 at 00:13 +1100, Martin Pool wrote:
> > === modified file 'bzrlib/_changeset.py'
> > --- bzrlib/_changeset.py	
> > +++ bzrlib/_changeset.py	
> > @@ -647,7 +647,8 @@
> >  
> >          :rtype: bool
> >          """
> > -
> > +        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?)

Martin: You and I discussed this (which appears in my branch) and
decided that you would simply revert that part of the patch when you
merged my stuff.

If my stuff gets merged via Matthieu then that's great and you should
just ignore this hunk when you merge.

D.

-- 
Daniel Silverstone                         http://www.digital-scurf.org/
PGP mail accepted and encouraged.            Key Id: 2BC8 4016 2068 7895