[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: Robert Graf-Waczenski <rgw_at_lsoft.com>
Date: 2007-05-10 09:04:16 CEST

> -----Original Message-----
> From: Les Mikesell [mailto:lesmikesell@gmail.com]
> Sent: Donnerstag, 10. Mai 2007 00:20
> To: Robert Graf-Waczenski
> Cc: Subversion Users
> Subject: Re: Two people adding the same file - can both versions be
> merged?
> Robert Graf-Waczenski wrote:
> >> 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.
> >
> > If two people add the file /path/to/some/deeply/nested/place/myFile.txt,
> > what else than the same thing is this supposed to mean? (At least this
> > is how i feel about this, especially when we talk about a source code
> > control system).
> I'd expect it to mean the same thing as if both had an empty file of
> that name as a parent and different content was added by different
> people. Does it?

The file did not exist in the repo before, i.e. did not have an
ancestor file (if that is what you mean by "parent").

Both people simply meant to add the file with the same name and with
the exact same purpose but different contents. Yes, the first developer
should have talked to the second one, but apparently he didn't, so
the second guy wasn't aware of the file having already been added
and started to write his own version, which turned out to have
quite important contents in it, hence the question if the contents
can somehow be merged with the contents of the file that had been
added by dev guy 1.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu May 10 09:03:44 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.