[Pkg-ace-devel] Switching to git

[Thomas Girard]

Hello,

Le 08/03/2011 02:10, Pau Garcia i Quiles a écrit :
> There is definitely something that *looks* weird in the conversion but
> I am not sure the commits themselves are missing, unsorted, or wrong.
> 
> I have been playing with git-svn using latest git + latest Subversion,
> and with svn2git ( https://github.com/nirvdrum/svn2git.git ). The
> outcome of both conversions is here:
> 
> http://www.elpauer.org/tmp/pkg-ace.git-20110303.tar.bz2
> http://www.elpauer.org/tmp/pkg-ace.git-nirvdrum-20110308.tar.bz2
> 
> If you run 'gitk --all' in two screens and compare, you'll notice some
> slight differences, mostly in the tags (they seem to be off-by-1
> commit).
> 
> Old branches (5.4.7-x, 5.6.3, etc) still exist and have contents in
> both conversions. I guess we will have to delete them manually before
> importing into git if we decide to go with one of those conversions.
> The "closing date" for the branch will be wrong but we can live with
> that.
> 
> Finally, I tried KDE's svn2git (
> git://gitorious.org/svn2git/svn2git.git ) which works directly on the
> raw Subversion repository. It does a much, much better work, in my
> opinion. For starters, it notices branches were removed, and I'd say
> it even "discovers" merges better than the other two conversions. The
> result is here:
> 
> http://www.elpauer.org/tmp/pkg-ace.git-svn2gitkde.tar.bz2
> 
> (I have only quickly reviewed the conversion using KDE's svn2git
> because I only got it working half an hour ago with some help from one
> of the svn2git authors)
> 
> Summary: please download the tarball that results from KDE's svn2git,
> run 'gitk --all' and verify. I think that's what we should use as our
> starting point in git. 

Thanks for looking into this. From what I've seen:
 - pkg-ace.git-20110303.tar.bz2 (git-svn) content looks like first
   attempt. Tags are good (i.e. aligned on the last commmited stuff
   in the branch being tagged, rather than an artificial empty commit
   mimicking SVN behaviour), as well as Commiters. Many alive branches,
   reported as not being merged.
 - pkg-ace.git-nirvdrum-20110308.tar.bz2. Off-by-one tag. Many alive
   branches, deleting them works but warns.
 - pkg-ace.git-svn2gitkde.tar.bz2. Same off-by-one tag to commit. No
   alive branch apart from upstream and master. Commiters appear with
   bad looking, e.g. tgg at localhost.

I agree that the last one seems the better one. Do you think you can
fix the commiters, then upload this to Alioth?

Thanks,
Regards,

Thomas