[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: <lsuvkne_at_onemodel.org>
Date: 2007-05-11 15:31:30 CEST

I wonder if when svn merge doesn't do exactly what you'd like, you could simply use diff, then the *nix (or cygwin) patch utility.

>>> On Wed, May 9, 2007 at 7:56 am, "Robert Graf-Waczenski" <rgw@lsoft.com> 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).

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri May 11 16:31:34 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.