Re: How to handle two users adding same file

Alexander Mueller <[email protected]> Wed, 30 Jun 2010 19:44:28 +0200
Newsgroups gmane.comp.version-control.subversion.rapidsvn.user
Message-ID <[email protected]>
Well it's true. Right now there is no convenience function like this in 
rapidsvn. If you are a developer, you are invited to help adding this 
feature.

Am 30.06.2010 13:01, schrieb Jonathan Prince:
> 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.
>
>
> www.sdl.com <http://www.sdl.com>
> www.sdl.com <http://www.sdl.com>
>
> *SDL PLC confidential, all rights reserved.* 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.
> SDL PLC is a public limited company registered in England and Wales.
> Registered number: 02675207.
> Registered address: Globe House, Clivemont Road, Maidenhead, Berkshire
> SL6 7DY, UK.

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

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