Intermittent failure to merge changes into working copy when doing updates

[Jason Neylon <jn...@porism.com>]

Hi, 
 
We have been using Subversion/TortoiseSVN for several months now and have
been having intermittent problems with the automatic merging on update
feature.

We generally use TortoiseSVN and I originally posted this on the TortoiseSVN
mailing list but was referred here as TortoiseSVN uses the Subversion
library to perform the merging.
 
Here is roughly what happens:
 
1. User A modified locally a file
2. User B modifies the file and commits to the repository 3. User A does an
update of the file 4. The update report that it has merged the User B
changes into the file.
(merged/green in TortoiseSVN update window) 5. When user A check their
working copy of the file before committing they notice that user A change
have not been merged into their working copy of the file. (the working base
of the file includes user B modifications.)