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

Re: To Merge or copy a feature branch?

From: Les Mikesell <lesmikesell_at_gmail.com>
Date: Wed, 16 Sep 2009 08:50:55 -0500

Gavin Baumanis wrote:
> pretty simple and sensible really...
> But it is just so much more easier to simply copy the files!
> I assumed your reply was going go to be the case.... but thought I
> would get some extra advice.
> In the past I have only ever merged over a specific file at specific
> revison.
> Or perhaps a specific file over a few revisions.
> And it was always from trunk into a release tag.
> I've never actually merged an entire folder before back into the trunk.

I know the advice usually is to merge, but what if there have been enough
changes in a branch that its history is really more representative than what is
currently in trunk and its contents are what you want? Is there anything
conceptually or philosophically wrong with deleting the trunk and copying the
branch back to replace it?

   Les Mikesell
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-16 15:51:57 CEST

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.