branch proposal

Jeremy Allison jra at
Thu Jul 13 17:08:28 GMT 2006

On Thu, Jul 13, 2006 at 11:14:24AM -0500, Gerald (Jerry) Carter wrote:
> Hash: SHA1
> Volker and I have been talking and would like to do
> away with the dual branch maintenance overhead of trunk.
> Most of the time trunk and SAMBA_3_0 are completely in
> sync the dual checkins are just unnecessary.
> I have created /branches/SAMBA_3_0_23 to handle fixes
> for the the 3.0.23 series.  If you have a fix that needs
> to go into 3.0.23a, please check it in here.  But let's
> be as conservative as possible.
> trunk has served its purposes in the past but really
> is of little use today.  I propose that we
> * Use SAMBA_3_0 solely for development and drop trunk.
> * When we are close to shipping 3.0.24, we copy SAMBA_3_0
>   to SAMBA_3_0_24 to stabilize.  but normal dev work
>   goes on in SAMBA_3_0.  This also prevents the loss of
>   history when we cut-over from trunk to SAMBA_3_0.
> * Continue to use /branch/SAMBA_3_0_RELEASE to cut
>   the tarballs for official releases.
> For any really risky work, we can either use bzr or svn
> tmp branches.
> Comments?

No problem for me. I've moved over to the new branches.



More information about the samba-technical mailing list