[Pkg-ace-devel] Switching to git

[Pau Garcia i Quiles]

On Wed, Mar 2, 2011 at 10:02 PM, Thomas Girard <thomas.g.girard at free.fr> wrote:
> Hello,
>
> Le 01/03/2011 23:38, Pau Garcia i Quiles a écrit :
>>> an empty pkg-ace/pkg-ace.git has been created on alioth. Please let me
>>> know if you encounter some access issues.
>>
>> OK. I tried again git-svn to convert from svn to git but it still
>> results in a somewhat incorrect (branches, tags, etc) conversion. I
>> want to give svn2git (what we used in KDE) a try but I have not really
>> had time. I hope I'll be able to work on this next weekend.
>
> What was the problem again? If you refer to [1] it might be that I'm
> not understanding how to read gitk display. Do you also feel like
> something is weird in the conversion?

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.

-- 
Pau Garcia i Quiles
http://www.elpauer.org
(Due to my workload, I may need 10 days to answer)