svn two people have to modify a file

Chao says that Joe Smith finished submitting a v2 version from the server and then John Doe in the next version v2 changed in this version v3 version of the submission
But the question now is Joe Smith first read v1 version locked the file , modify it in John Doe v1 version read from the server can not be submitted at this time , but although John Doe , etc. can be changed locally submitted and found to be changed then only connotes negotiate changes to their merged together

Now the question is there a way to prompt a file is locked or not let John Doe about locally modified

John Doe is now art with dreamweaver, dw , there are no plug-ins ? There is nothing like the prompt file is locked or disabled locally modified functionality ?
------ Solution ---------------------------------------- ----
front checkout is that you can submit. Submit over, behind that download the latest code, merge and submit .
Dreamweaver 's svn plugin subWeaver
subWeaver, a few K only a small plugin that can operate in dreamweaver used SVN functionality.
deficiencies is in the file icon does not change . The following is an open source project addresses.
http://sourceforge.net/projects/subweaver/

------ Solution ------------------------------------ --------
encounter this situation.
I usually keep one copy of the document file, and then checked the new version.
let other unlocked.
combine copy and the new version , the new version integrates a new submission . . .
SVN contrasting features, but feels better with the convenience of direct clip . .
------ For reference only -------------------------------------- -
feeling is still waiting for him to change himself after modification
------ For reference only ---------------------------------------


John Doe but I do not know what time you want to modify the file , so that I can not be locked , we can not modify files
------ For reference only ----- ----------------------------------



now in front of locked files that do not know behind the locked downloaded the latest version ( but still in front of a local change ) followed also changed so that the last will of local the two combined together to be changed manually collaboration
You said consolidation refers to two people at the same time can be automatically changed files combine them?
------ For reference only -------------------------------------- -

  
  
now in front of locked files that do not know behind the locked downloaded the latest version ( but still in front of a local change ) followed also changed so that the last will of local the two combined together to be changed manually collaboration   
You said consolidation refers to two people at the same time can be automatically changed files combine them?  
no manual ah. Behind you that can not always be submitted , unless the front of the first submitted
------ For reference only ------------------------- --------------

    
    
now in front of locked files that do not know behind the locked downloaded the latest version ( but still in front of a local change ) followed also changed so that the last will of local the two combined together to be changed manually collaboration     
You said consolidation refers to two people at the same time can be automatically changed files combine them?          
no manual ah. Behind you that can not always be submitted , unless the front of the first submitted  

Although the author can not but later changed the other in front of the local version back again submitted v3 v3 version based on the change in the back of the first in the v2 version changed now but also in the v3 version and then change again
------ For reference only -------------------------------- -------
update down to re-submit .
------ For reference only -------------------------------------- -

      
      
now in front of locked files that do not know behind the locked downloaded the latest version ( but still in front of a local change ) followed also changed so that the last will of local the two combined together to be changed manually collaboration       
You said consolidation refers to two people at the same time can be automatically changed files combine them?                
no manual ah. Behind you that can not always be submitted , unless the front of the first submitted          
  
Although the author can not but later changed the other in front of the local version back again submitted v3 v3 version based on the change in the back of the first in the v2 version changed now but also in the v3 version and then change again  
people behind change things for the person in front is transparent ! ! In front of people to change is based on the latest server version, he just changed his . Regardless of how many people have switched back version , not submitted for the front man is not affected . So what you say does not exist in the B of A needs to be changed v3 version of the problem , svn if even this basic functionality is not achieved, then who else with his ah. Only B would be more trouble . To merge conflict finally submitted
repair