[MERGE] Bug #107967: fix bzr mv --after on a directory

[Aaron Bentley]

Aaron Bentley has voted resubmit.
Status is now: Resubmit
Comment:
Wow, is mv ever DWIMmy.

Even so, your patch looks reasonable.  The one issue I see is that 
you're comparing osutils.file_kind to inv.get_file_kind. 
osutils.file_kind can return 'file', 'directory', or 'symlink', and 
inv.get_file_kind can also return them.  But inv.get_file_kind can also 
return 'tree-reference', and your code will not behave properly in this 
case.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C0990C529-4F9E-4129-828C-4FB5885E3370%40oxidized.org%3E