[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Concurrent move and edit

From: Oliver Mangold <o.mangold_at_gmx.de>
Date: Fri, 3 Jul 2009 01:22:29 -0700 (PDT)

Assume the following scenario:

User A moves/renames file 'foo' to 'bar'.
User B edits file 'foo'.

Both users do update then commit (it doesn't matter in which order the server sees the operations, I would like any order to work).

Then (depending on svn version) the result is:

- either a conflict
- or user B sees a unedited file 'bar' which is part of the repository, and an additional unversioned file foo with his changes.

Is there a chance to make subversion handle this in the way that the result is simply one (moved and edited) file bar?
Git doesn't have a problem with this.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2367738

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-03 10:24:22 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.