a question about "svn merge"

[Boying.Lu]

Hi, All,

I use "svn merge ^trunk" to merge changes to my branch.

I found one file that shows no conflict but actually the changes were
not added to this file at all.

The subversion I use is 1.6.12.   Is is a known issue or a new bug?

Thanks

Boying