[Pkg-samba-maint] I'm back working on the full Samba 4.0 package

[Ivo De Decker]

Hi Christian and Andrew,

On Sun, May 05, 2013 at 08:24:08AM +0200, Christian PERRIER wrote:
> May I suggest that you push your git repo to Alioth (git.debian.org)?
> 
> We currently have:
> 
> git+ssh://git.debian.org/git/pkg-samba/samba.git : I'm trying to
>   figure out what that may be
> git+ssh://git.debian.org/git/pkg-samba/samba4.git : packages developed
>   by Jelmer up to now
> 
> 
> IMHO, the "right" way would be either merging Andrew's work into the
> current samba4.....or just replace it and then rename it to "samba",
> moving aside the current "samba".
> 
> I though a bit more about the SVN repo conversion and, though I didn't
> try to do it yet....I think it will be a LOT of work, mostly because
> this is a multi-package repository and I doubt we can really easily
> make it a "standard" git-buildpackage-compliant git repo. And I even
> more doubt we can really merge it with the work by Jelmer then Andrew.
> 
> I'm also unsure about the benefit we would have from this.
> 
> So, my proposal would finally be to keep things in SVN for the
> "samba3" packages : we continue to develop there for versions 3
> (wheezy and squeeze security updates, maybe some backports)....and we
> use the new git for versions 4.
> 
> Otherwise, I fear that the conversion+merge work becomes a blocker and
> we indeed need to introduce "samba" packages that are version 4.x as
> soon as possible in the jessie release cycle. We *know* that we're
> likely to break upgrades of existing setups and we'll probably need
> time to sort them out.

I worked on this, and I have a new converted repo for just the samba part,
which should have the correct branches and tags for most historical releases.

I did a conversion with git svn and ran a post-processing script to convert
the svn tags and branches into names that are more suitable for git and
git-buildpackage.

It also tries to move the tags to the commit on the main branch (if it is the
same as the svn tag commit), to make the history clearer.

The scripts are attached, for those who are interested. The conversion was
inspired by https://github.com/nirvdrum/svn2git (but works in a different
way).

The repo is available at
git.samba.org/git/pkg-samba/samba-test.git
http://anonscm.debian.org/gitweb/?p=pkg-samba/samba-test.git

Please look at the repo, to see if I missed some things. If the repo is OK, it
can replace the samba.git that's currently there. If I missed some things, I
may need to rerun the conversion, which will change all the git commit ID's,
so if you are on a slow link, maybe wait a little bit to clone it.

I would like to have agreement on this fairly soon, to avoid blocking Andrews
work.

If we agree on this, I would propose to completely abandon the svn repo (which
obviously should not be deleted for historical reasons) and do all our work
(even for squeeze and wheezy) in the new repo.

This repo should work with git-buildpackage (in the default config). I would
also propose to use git-import-orig with pristine-tar (but this can be
documented afterwards).

Obviously some small thing still need to be changes:
- repo name
- commit hooks for mails to mailing list and bugs
- ...

But those aren't blockers.

Also, some branch names we used in svn might not be correct anymore (jessie,
experimental). We can just update those branches to make them point to
something more relevant today.


Cheers,

Ivo

-------------- next part --------------
#! /bin/bash

AUTHORPROG=~/bin/git_svn_author

OPTS="--authors-prog=$AUTHORPROG"

echo git svn init svn://svn.debian.org/svn/pkg-samba/ -T trunk/samba -b branches/samba -t tags/samba
git svn init svn://svn.debian.org/svn/pkg-samba/ -T trunk/samba -b branches/samba -t tags/samba

echo git svn fetch $OPTS
time git svn fetch $OPTS


-------------- next part --------------
#! /usr/bin/perl

use strict;

my $login = shift;
my $email = "$login <pkg-samba-maint\@lists.alioth.debian.org>";

if ($login =~ /^[a-z0-9-]+$/) {
	$email = "$login <$login\@alioth.debian.org>";
} 

print "$email\n";

-------------- next part --------------
A non-text attachment was scrubbed...
Name: fix_tags.pl
Type: text/x-perl
Size: 2534 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-samba-maint/attachments/20130505/aa8d9167/attachment.pl>