> -----Original Message-----
> From: Bob Hiestand [mailto:email@example.com]
> Sent: Saturday, December 02, 2006 6:31 PM
> To: Brown, Carlton
> Cc: firstname.lastname@example.org
> Subject: Re: Merges do track ancestry after all?
> 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.
In fact what the guy did was merge version 1 through HEAD of the trunk
into an empty branch. So logically it had the effect of re-creating the
entire trunk from scratch. What he intended to do, and what I expected
would happen, was that this would simply discard all the history.
Instead, it appears that it effectively did an svn copy of the trunk,
preserving all history. So my questions are:
1) This looks like an implicit copy took place, is that what happens?
Are there any other implicit surprises I need to know about?
2) Say you actually did want to do a copy but discard all the
history... what's the easiest way to do that?
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. GA624
To unsubscribe, e-mail: email@example.com
For additional commands, e-mail: firstname.lastname@example.org
Received on Sun Dec 3 16:04:10 2006