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

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

From: Brown, Carlton <Carlton.Brown_at_BellSouth.com>
Date: 2007-05-09 21:02:50 CEST

> -----Original Message-----
> From: Robert Graf-Waczenski [mailto:rgw@lsoft.com]
> Sent: Wednesday, May 09, 2007 9:56 AM
> To: Subversion Users
> Subject: RE: RE: Two people adding the same file - can both
> versions be merged?
> > 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?

That 2 different people chose the same name for different contents? It
does happen, believe me. What level of nesting is deep enough to
guarantee this assumption? 3 levels? 5 levels? 9 levels? How would
you tell the machine what sort of guess is good enough for you?

This is the class of problem that --ignore-ancestry is intended to
resolve. But it seems it doesn't work here unless the 2 files are
identical. The --ignore-ancestry switch makes no difference in the
outcome. That seems like a bug to me!


The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA625

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed May 9 21:03:45 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.