[Pkg-samba-maint] (forw) [Announce] Samba 3.6.7 Available for Download

[Ivo De Decker]

On Tue, Aug 07, 2012 at 08:12:57AM +0200, Christian PERRIER wrote:
> > > Anyway, I'm considering to upload this 3.6.7 release to experimental.
> > > 
> > > In our VCS, we have two options:
> > > 
> > > - branch the trunk as experimental and do 3.6.7 work there
> > > - branch the trunk as wheezy (which we'll do at some point anyway) and
> > > work on experimental in the trunk
> > > 
> > > Advices?
> > 
> > I think using an 'experimental' branch for packages in experimental is the
> > best way. But I don't really feel that strongly about it.
> 
> My only concern is that this is the method I used during the squeeze
> freeze and I had to manage some very painful merges.

I don't think it makes sense to merge the old experimental branch. It has no
relation to the version in trunk or the version that is going to be in
experimental.

> Particularly, the *current* experimental branch is a leftover of the
> last version we uploaded to experimental (3.6.1-1), which means a
> quite painful merge, probably. An alternative is of course dropping
> entirely the current experimental branch and start one from
> scratch. Indeed the new experimental branch has nothing to do with the
> current one.

You could do that, or use a branch with some other name. But if it is easier
to branch of a wheezy version, I don't really object to that.

Just use whatever you think is the simplest way :)

> I really start to be missing git now that I'm more and more
> comfortable with it..:-)

We should discuss moving to git when we start the merged samba 4 package.

Cheers,

Ivo