Thanks Johnathan and Rodrigo, i finally merged my whole branch into trunk,
although i spent several hours on it, using tools as SmartSynchronize proved
a lot less painful than i though, I'll just make sure to merge periodically
in the future and save me all this hassle.
Regards!
On 10/2/07, Rodrigo Araujo <rodrigomaraujo@gmail.com> wrote:
>
> Hello Pablo,
>
> Johnathan give you a good explanation what to do. Let know if you do this
> and what problems you found.
>
> But why you say that "Now i know we should used a branch just for quick
> changes not for hundred of commits" ? Branch show all his power doing big
> changes easy! But I always recommend to merge your stable line to develop
> line with the appropriate frequency to eliminate a need of a hard branch at
> the finish and let the bugs fixed quickly in development line.
>
> --
>
>
>
>
>
>
> Rodrigo M. Araujo
> Email: rodrigomaraujo@gmail.com
> Blog: http://rodrigomaraujo.wordpress.com
>
>
>
>
>
> On 10/1/07, 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
> >
>
>
Received on Tue Oct 2 20:38:23 2007