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

Merges do track ancestry after all?

From: Brown, Carlton <Carlton.Brown_at_BellSouth.com>
Date: 2006-12-01 23:34:51 CET

Hello,

While doing a merge today, I was surprised to notice that if I perform a
merge of a certain range into a directory, the resulting files all show
the complete history just as they exist in the source changeset. I had
previously thought that merging does not preserve any ancestry at all.
Can someone explain how this works?

I would like ideally to find a reference on the nuts and bolts of the
merging process; none of the books out there treat this in any more than
a superficial manner. How does Subversion figure out how and what to
merge, or whether a conflict exists?

Thanks
Carlton

*****

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. GA623
Received on Fri Dec 1 23:35:42 2006

This is an archived mail posted to the Subversion Users mailing list.