Re: noob question-- how to replace the trunk with a branch?

On Mon, Oct 08, 2007 at 05:46:47PM -0700, Reuben Avery wrote:
> hi all,
>
> yeah, newbie question here: so I have a branch that we've been working on
> and I'd like to now deploy all these changes into the trunk and do away with
> the branch. would I do this with an svn merge or with a copy? and how
> would the command look?
>
> this is what I'm currently thinking but I am hesitant to pull the trigger:
>
> svn merge http://repo/svn/project/trunk
> http://repo/svn/project/branches/mybranch project_working_copy
>
> (project_working_copy is a working copy of project/branches/mybranch)
>

You have a read of the book and ask a better question :-)

I think you're proposing to do exactly what the book warns about:

The book has this in the section "Merging a Whole Branch to Another"

    "But which two trees should be compared? At first
    glance, the answer may seem obvious: just compare the
    latest trunk tree with your latest branch tree. But
    beware—this assumption is wrong, and has burned many
    a new user!

I suggest you get a test repo and try things with that.
Then get svnmerge.py to help you track merging; but that comes later.

--
Matt
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org