Pablo,
Merge the changes from trunk to the branch. This will work if you
created the branch from the trunk. You may get a few conflicts, but
most everything should come over fine. Once that is done, then merge
the branch to the trunk. Use the Subversion tools, they really do a
good a job.
If you concerned about how many conflicts your going to have, try doing
a dry run first and then maybe generate a unified diff file if you need
to see the actual projected changes.
Don't worry about doing big code changes in a branch and then moving
them to trunk. We do this all the time. Sometimes best practices don't
apply. Remember Subversion is flexible enough to work however you need
it, but keep those best practices in mind and try to stay true to them.
Your going to miss a lot of revision history in the trunk. As long as
the commit message for the merge results in trunk refer back to the
branch, it should be no problem tracing back a change though.
Hope this helps,
Johnathan
>>> On Mon, Oct 1, 2007 at 6:16 PM, in message
<49aa993a0710011616m2f150955xbc84f83949631c51@mail.gmail.com>,
pablasso
<pablasso@gmail.com> wrote:
> Hello everyone.
>
> I don't have a lot of experience managing big repositories (by my
> standards), surely more experienced users can give me some advice,
this is
> my situation:
>
> We have been working on the trunk for a site for some months until
its
> release, then a new version of the web had to be developed but out of
the
> public view, so we decided to make a branch and start working on
version 2.
> Months passed by and now the version 2 is finally ready to go
public.
>
> The problem is that V2 grew huge, and V1 has several changes as well
(bugs
> and some minor features) and looking at merge diff's and resolving
conflicts
> is getting extremely time consuming and burdersome.
>
> Now i know we should used a branch just for quick changes not for
hundred of
> commits, and merge it periodically, but the damage is already done.
Any
> advice of how to get out of the hole?
>
> I wonder if is possible to merge the trunk changes into the branch
(although
> it has many changes, is less code than the branch), and later
'convert' the
> branch to trunk?
>
> Any advice of what can i do or what software should i use? i'm afraid
i
> can't try the merge tracking by openCollab, since i'm on 1.4.x
>
> Thanks a lot.
>
> Pablo
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 2 16:35:54 2007