I have a branch where I have modified <code>a.cpp</code>. If in trunk someone deleted that file, and I run <code>fossil update trunk</code>, fossil will silently merge the branch modifications and the trunk delete silently into a file delete.

Fossil should report this as a conflict.