I'm wondering if the behavior of "svn update" is correct in this below case:
I have a file in my local working copy containing a change on one line in the file. Meanwhile the file is modified and committed by someone else, with a change to another line in that file. It turns out that that change made by the other person was wrong, so I want to stick with the contents of the file I have, so I do a: svn update <the file path> --accept mf (i.e. mf=mine-full) to mark my version as being merged with HEAD, but keeping my source as it is. However, what really happens is that the changes from that other revision still gets merged into my local source, while I expected the contents of my version to remain unchanged. The svn client I'm using: svn version 1.14.1-SlikSvn (SlikSvn/1.14.1) Regards Mikael
