If you rename and modify a file in the same commit, you will loose its history:
You have to do a commit just with the rename operation (identical file contents), and then modify it. Sheesh, good to know about that!
I recall I had a similar problem with Subversion once… I think it was refusing my commit or something. I had to go back and do just the rename, commit and then modify the file.