[MERGE] ftp transport, dsilver's branch

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

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?)

This is an unrelated bugfix that I was unable to craft a test case for.
 Eventually, I uncommitted it, but not before Daniel merged me.

It was related to reverts, and some discrepancy between inventory
entries and files, if I recall correctly.  The notion was going to be
that 'needs rename' only applied to files, not inventory entries.

The current method will falsely report that a deleted file needs a
renamed, because one of self.parent and self.new_parent will be None.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFD32/I0F+nu1YWqI0RAnlsAJ9FrLFYXXPYQ2+r9ldyXTnkIOkZYgCfRq1q
P6DV9mN43X1+gs3P6CcsAfE=
=eL5d
-----END PGP SIGNATURE-----