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

Re: RE: Merges do track ancestry after all?

From: Mark Phippard <markphip_at_gmail.com>
Date: 2006-12-03 16:20:52 CET

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

When merge creates a new file/folder it is doing the equivalent of
copy, which means you will get history. Subversion does not have a
copy without history option. To do that, you'd have to do a
filesystem copy in your working copy and then do svn add/commit to get
it to the repository.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Dec 3 16:21:33 2006

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