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

RE: Merging and Ancestry

From: Reedick, Andrew <Andrew.Reedick_at_BellSouth.com>
Date: 2006-08-17 15:46:50 CEST

> -----Original Message-----
> From: Lakshman Srilakshmanan
> deleted the existing file and added the same file again. At commit we
> get an error "Out of Date".

        Sounds like your workspace is out of date. Try running 'svn

> I added a new file test.txt into /branch/A. The same file was needed
> by project using /branch/B, so they __added__ it again.

        In ClearCase, we would call this an Evil Twin. Subversion
handles Evil Twins by selecting one file object to keep (the target I
believe) and then diff'ing the two file objects' contents (the file
itself) to detect merge conflicts, etc.. In short, Subversion does the
right thing. (In ClearCase we would have to pick one of the file
objects, and then manually diff and merge the file contents.)
        The 'out of date' isn't related to or caused by the Evil Twin.


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. AL621

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Aug 17 15:49:38 2006

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.