Fix detection of directory entries in the inventory. check_inventory_shape allows you to check that an inventory entry is a directory by ending it in a '/'. However the code to add the '/' to the entries for comparison uses the kind == 'dir' to d

James Westby jw+debian at jameswestby.net
Mon Jun 25 07:29:08 BST 2007


On (25/06/07 13:03), Martin Pool wrote:
> Hi James,
> 
> This looks like a correct fix but maybe you can add a test that
> prevents it regressing?  Actually it seems like with this fix in place
> some things in test_commit will now fail?
> 
> (Or was this actually just a commit mail sent to the wrong place,
> since you had the whole message in the subject?)
> 

Hi Martin,

I was trying out 'merge-directive --send-to' and that filled out the
subject for me with the commit message. The -m option might help here,
but I wasn't sure from the help text.

I'll try adding a test, somewhere in test_selftest I guess. I admit that
I didn't run the testsuite, but the only uses of check_inventory_shape
in bzrlib do not test for the presence of directories, only their
children, so they are not affected.

I will try and fix this up tonight.

Thanks,

James

-- 
  James Westby   --    GPG Key ID: B577FE13    --     http://jameswestby.net/
  seccure key - (3+)k7|M*edCX/.A:n*N!>|&7U.L#9E)Tu)T0>AM - secp256r1/nistp256



More information about the bazaar mailing list