Re: To Merge or copy a feature branch?

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
    lesmikesell_at_gmail.com
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2395557
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].