Question: Odd merging behaviour with copied/moved files

Hello,

I'd just had the following situation:
A repository with a file: File1

A clone of this repository.
I made some changes to File1 in this repository and checked them in

Now someone decide to to rename and copy the File1 in the first repository and
checked those changes in. Now there is no File1 any more in the first repository.

After a while I pulled from this first repository. My changes are only merged in
one file! I think this behavior is strange.

In the second case its also strange, that if there is a copy in the first
repository, after a pull my changes in the copied file are also missing.

Is there a possibility to get warned about these situations, or better is there
an automatic way to merge my changes to both pulled files?

Thanks,

Michael