[MERGE] ftp transport, dsilver's branch

John Arbash Meinel john at arbash-meinel.com
Tue Jan 31 14:57:26 GMT 2006


Aaron Bentley wrote:
> 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

The basic ftp changes were +1, and Aaron said he reverted this change.
So I merged and committed the ftp fixes (jam-integration revno 1519),
but I reverted these two lines. If they're not good enough for Aaron
(who put them there), they're not good enough for me. :)

Alexander, can I request that you test this out as well? I know I was
having some troubles getting 'bzr selftest' to pass on win32, but don't
worry about that yet. Look more at just testing if the ftp changes work
for your ftp site.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 252 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060131/58dfa251/attachment.pgp 


More information about the bazaar mailing list