Syncronized checkout has different code than source

[Bryan]

* Created a branch "trunk" on a server.
* Created a local checkout of the trunk
* Branched the local checkout of trunk, made changes, commited
* Merged local branch into local checkout of trunk
* Commited local trunk, which sent the changes to the server

The revision numbers match up between my local checkout of trunk and the
server's trunk, but when I inspect the modified files on the server, they have
the old code.

If I checkout from the server's branch the correct code shows up.

Is this the expected behavior?  Why can't I view the latest source files in the
server's trunk?