[Pkg-samba-maint] Branching for etch?

[Steve Langasek]

On Mon, Jan 01, 2007 at 11:17:37AM +0100, Christian Perrier wrote:
> Quoting Steve Langasek (vorlon at debian.org):
> > On Mon, Jan 01, 2007 at 10:14:35AM +0100, Christian Perrier wrote:
> > > I was about to start committing some changes to the SVN, following the
> > > discussion about merging some of the Ubuntu changes. However, before
> > > doing so and as these changes pertain to lenny development and not
> > > etch development, I'd like to propose you to create a branch in the
> > > SVN, for the etch package.

> > No, not until actual branching occurs: i.e., we have to upload to
> > testing-proposed-updates, or etch is released.  Otherwise we risk having to
> > do busywork to copy fixes between the two branches. :)

> Hmmm, small work, indeed. The probability for fixes other than simple
> translation stuff is very low. It seems obvious that none of us has
> enough time to work on important bugs (the only ones, apart from RC
> bugs, that would be suitable for updates in etch, right?).

> Not having branching currently prevents working on more long-term
> things like the Ubuntu changes merges I mentioned earlier.

Create a personal branch, and merge it to trunk after etch releases?

Delaying the etch branch until the known certain branch point has the
advantage of preserving a more accurate picture of revision history.  I
think that's worth waiting for.

-- 
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/