[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: How to search between branches (complete)

From: Hermann Voßeler <hermann.vosseler_at_baaderbank.de>
Date: 2007-04-18 17:52:50 CEST

Am Mittwoch, den 18.04.2007, 13:42 +0000 schrieb ANGonline:

> To answer to those that suggested to use less branches and instead commit more frequently on the main trunk,
> I find it an impossible solution because we are not allowed to transfer anything to the production trunk until
> it's tested and fully functional. To commit something that is still "work in progress" would mine the overall
> stability of the system.

An possible solution for this is to use an "integration branch" (or
trunk if you prefere to think this way). For example, we have here
a project with high stability requirements (for production use in
house). For this we have:

.../svn/PROJ/prod
.../svn/PROJ/int
.../svn/PROJ/base

i.e. we indeed have three trunks. The devs either work directly on
base, which only needs to stay functional at large (and allways
pass the compiler). Or they branch off short branches from base
and merge them back after finishing the task. To prepare a release,
we merge all changes since last release over to the int-trunk and
make our QA testing there. Possible fixes get merged back to /base.
If /int is ready for production use, the changes are merged over
to /prod.

>
> I think I'll try to think of some automation via hooks.

maybe log each branching event into a small database?

Cheers,
Hermann

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Apr 18 17:53:06 2007

This is an archived mail posted to the Subversion Users mailing list.