Re: Merge Question

Hello,

I have the following structure in my projects: a "trunk" for main development (new features, customer's change requests, ...) and release branches for every major release. If there is a bug in a release, i fix the bug in the according release branch and merge the changes to the trunk.

So the realease branches always have current bug fixes but don't contain change requests, new features, etc.

Maybe something similar would fit your needs, too?

Regards,
Gerhard

On Thu, 06 Apr 2006 11:05:59 +0200, Geert Theys <gt@eu.pearldoc.net> wrote:

> Hello,
>
> I have a specific merge question I can't seem a answer for.
>
> I know the merging from revision to revision, but I have following
> problem.
>
> I try to do releases for installation at a customer site.
>
> I start with Rev1 as start.
>
> Rev2 is a bugfix
> Rev3 is a change request
> Rev4 is another bugfix
>
> No the client needs to give a ok for these 3 last revisions. But I the
> give ok for Rev2 and Rev4 I want to have a checkout of Rev1 with only
> the Rev2 and Rev4 changes in it.
>
> What is the best strategy to follow here?
>
> Regards,
> Geert Theys.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Apr 6 11:50:51 2006