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

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

From: Olivier Dagenais <olivier.dagenais_at_formark.com>
Date: 2007-05-09 15:36:44 CEST

> Well, couldn't svn simply assume a rev0 as consisting of the empty
> file
> and interpreting the first dev's changes as having occurred between
> rev0 (which never existed in the repo) and rev1 by simply saying that
> all lines have been added? Then, if dev2 tries to update, the usual
> merge conflict would occur and dev2 would be able to merge his own
> changes into the changes that svn has constructed from diffing rev0
> and rev1 of the file that was added by dev1?

I think the point is that most of the time, when (if?) two people add the same file, it's not guaranteed to mean the same thing or have the same content. What should probably have happened is the file should have been committed as soon as it was added, even if blank (or mostly) and then both developers would have had a common starting point after running an update.

Olivier Dagenais
Software Engineering / Génie logiciel
Formark - Combine the Best of SharePoint® and Livelink®
Phone: 613-599-5173 ext 238
Make sure you don't miss anything: subscribe to the Formark Newsletter:
Received on Wed May 9 15:35:05 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.