How to handle two users adding same file

We are having a re-occurring situation with two users adding the same
file name to a project.

 

The first user commits to the repository. The second user is then stuck.

Their new file cannot be committed (as it already exists in the
repository). They cannot update their local files (as an unversioned
item exists locally).

 

Is there any way to resolve this neatly? The only thing I can think of
is that the second user needs to move the file to another location,
update the project then replace the local repository version with their
version (from the other location). This would then enable diff & merge
functions.

This seems a bit long-winded (requiring operations in file system then
RapidSVN then file system again, before returning to RapidSVN) and non
user-friendly.

</pre>
<BR style="font-size:4px;">
<a href = "http://www.sdl.com"><img src="http://www.sdl.com/images/email logo_150dpi-01.png" alt="www.sdl.com" border="0"/></a>
<BR>
<font face="arial"  size="2" "><a href = "http://www.sdl.com" style="color:005740; font-weight: bold">www.sdl.com</a>
<BR>
<BR>
<font face="arial"  size="1" color="#736F6E">
<b>SDL PLC confidential, all rights reserved.</b>
If you are not the intended recipient of this mail SDL requests and requires that you delete it without acting upon or copying any of its contents, and we further request that you advise us.<BR>
SDL PLC is a public limited company registered in England and Wales.  Registered number: 02675207.<BR>
Registered address: Globe House, Clivemont Road, Maidenhead, Berkshire SL6 7DY, UK.
</font>

------------------------------------------------------
http://rapidsvn.tigris.org/ds/viewMessage.do?dsForumId=671&dsMessageId=2627731

To unsubscribe from this discussion, e-mail: [[email protected]].