[Pkg-samba-maint] switching samba packaging to git tomorrow - don't use svn anymore

Jelmer Vernooij jelmer at samba.org
Mon May 6 19:12:39 UTC 2013


On Mon, May 06, 2013 at 10:18:00AM +0200, Ivo De Decker wrote:
> On Mon, May 06, 2013 at 02:59:45AM +0200, Jeroen Dekkers wrote:
> > > If there is some reason not to do this, please shout quickly.
> > 
> > I think it is nicer if real names and email addresses are used in the
> > Author field of commit messages, so that the old commits will have a
> > similar Author field as new commits made directly with git. I've
> > attached an authors file that can be used with git-svn to do this. I
> > just tested it with
> > 
> > git svn init svn://svn.debian.org/svn/pkg-samba/ -T trunk/samba -b branches/samba -t tags/samba
> > git svn fetch --authors-file=../pkg-samba-authorsfile
> 
> Thanks for looking at the repo.
> 
> I prefer not to do this, as this feels like rewriting history. Subversion only
> knows user id's, not emails, so that is what's in the old repo. Also, some
> addresses (and even names) changed over this period, so there could be
> discussion about the exact conversion. Any change will change all commits ID's
> that are based on it, so it will break the repo.
Rewriting history is common in Git - rebase or filter-branch rewrites
history. :-)

This is the only moment really when we can make changes like this to
the Git repository - once we do the conversion, we don't know what
other repositories are out there that are based on the Git repo. Making changes
to history later will break all forks, which we will want to avoid.

Old and outdated email addresses aren't just a problem for the
SVN conversion but in other repositories as well. Tools that care
already have to deal with that problem, e.g. through .mailmap.

> > Git svn fetch has been running for quite some time now, but hasn't
> > finished yet. I think the authorsfile is complete, but as git svn
> > fetch hasn't finished running I can't be completely sure. Git svn
> > fetch will stop if any name is missing, then you can easily add the
> > missing name and continue.
> The conversion took 6 hours last time. If there are no structural problems
> with it, I'd rather not run it again...
It sounds like Jeroen is already close to finishing a conversion with
the author map.

Cheers,

Jelmer



More information about the Pkg-samba-maint mailing list