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

RE: Two people adding the same file - can both versions be merged?

From: <Chris.Fouts_at_qimonda.com>
Date: 2007-05-08 16:06:59 CEST

I wonder if an "svn update" (instead of the renaming, co, renaming back
would have worked?


        From: Robert Graf-Waczenski [mailto:rgw@lsoft.com]
        Sent: Tuesday, May 08, 2007 2:57 AM
        To: Subversion Users
        Subject: Two people adding the same file - can both versions be
        Hi svn gurus,
        yesterday this issue here came up: Two developers have
independently of each other started working on a to-be-added-to-svn
file. One developer was first to add the file and was able to commit
successfully. The second developer had no such luck. He added the file
(containing his own changes) and of course the commit attempt failed
because svn reported that the file already exists. So, in terms of SVN,
no error occurred. However, the question that i was unable to answer in
a satisfactory way was: Is it possible to merge the changes that the
second developer had in his version of the file to the contents of the
file that had already been added to the repo?
        We resolved the issue by having the second developer first
rename his file, then checkout the version that the first developer had
added and then using local wc merge tools (i.e. manual inspection in our
case) to merge the changes of developer 2 with the changes of developer
        Is there any other, more automated method of resolving such an
Received on Tue May 8 16:07:23 2007

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.