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

Re: Merges do track ancestry after all?

From: Bob Hiestand <bob.hiestand_at_gmail.com>
Date: 2006-12-03 00:30:54 CET

On 12/1/06, Brown, Carlton <Carlton.Brown@bellsouth.com> wrote:
> 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?

Were this files new in the branch into which you merged? If they were
just copied, the copy traces back to the history of the original.

The history that isn't preserved is when you are merging into an
existing file, at which point only a single change is made, regardless
of the number of logical changes composing the merge.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Dec 3 00:31:38 2006

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