On Mon, Apr 26, 2010 at 16:34, Phil Pinkerton <pcpinker...@gmail.com> wrote: > svn 1.6.5 while in a working copy I modified a file for testing. > After testing I wanted to update the file I modified in the working copy to > the version in the repository. > > the resulting update did not replace the files in the working copy as > expected the modified file still remains. > > the only way I could have the update work was to delete the modified file > then do the update. > > Why did svn not update the modified file ?
It may have and you didn't notice. Changes made since your last checkout/update are merged into your local copy silently (well, not 100% silent, you should get a "merged" indication). Any conflicting changes (you and the other user modified the same line, but in different ways) should flag a conflict.
