ok testing over.
read the end of this chapter, about committing:
http://svnbook.red-bean.com/en/1.4/svn. ... le.resolve
if 2 devs check out the SAME revision, and work on it simultaneously. That's OK.
The first dev to commit will be allowed to do so.
If the second dev has changed any of the same files as the first dev and tried to commit - THE COMMIT WILL FAIL.
Dev 2 will have to do an update, at which point your SVN client will merge the changes that dev 1 made. dev 2 can now commit OK, and the changes that both devs made are kept.
(important note that made this make sense to me: it's your svn CLIENT that does the merging, not the SERVER).
If both devs changed the same code, and SVN cannot work out a merge, dev 2's files will be put into CONFLICT status, and he will have to manually do some merging. then he sends a RESOLVED command before committing further changes on that file are allowed.
It seems fairly safe to me. I've tested this scenario with MtI just now and it works. we're now at
revision 42.