[Pkg-samba-maint] r1254 - trunk/samba/debian

[Steve Langasek]

On Sat, Mar 03, 2007 at 08:47:27AM +0100, Christian Perrier wrote:
> Quoting Steve Langasek (vorlon at debian.org):
> > On Fri, Mar 02, 2007 at 07:56:06PM +0000, Christian Perrier wrote:
> > > Author: bubulle
> > > Date: 2007-03-02 19:56:06 +0000 (Fri, 02 Mar 2007)
> > > New Revision: 1254

> > > Modified:
> > >    trunk/samba/debian/changelog
> > >    trunk/samba/debian/smb.conf
> > > Log:
> > > Remove changes from the trunk

> > Um?  Why?

> Actually because I suppose that the correct entry for debian/changelog
> can only be added when we will upload the new package in etch.

Well, you didn't completely remove the changelog entry anyway, so there was
still a 3.0.24-3 changelog entry on both branches, if that was your point.

> Indeed, smb.conf can certainly already be modified but
> debian/changelog has to wait....so this was indeed my method to avoid
> messing up.

> But, you know, I'm not very good to handle branching in whatever VCS,
> which I probably underuse.

As mentioned in my last commit message, changes really need to be included
on the trunk first, and only afterwards should they be considered for the
etch branch if they need to be backported because we're going to be
uploading from something other than 'trunk'.  Honestly, I still don't see
that a branch is appropriate here, because I don't see anything on the trunk
that is out of the question for etch.  I would argue that we should upload
from trunk, and only create the etch branch if the release team (... the
rest of the release team ;) tells us it's not acceptable, or once we're
otherwise no longer able to get packages into etch via unstable (e.g, once
we've released).

Anyway, a separate issue is that the etch branch in the svn repo doesn't
accurately reflect the tree structure underneath the trunk, which means a)
we can't have an etch branch for any of the other packages we were going to
include in the repo, and b) more importantly, Joey Hess's "svnpath branches"
command doesn't do the right thing ;)

So with your approval, I would like to delete out branches/etch again and
restore it, with the correct directory structure, only once we a) have an
etch update rejected by the release team, or b) etch is released.

Thanks,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
vorlon at debian.org                                   http://www.debian.org/