Hi,
I want to set up a git mirror for matplotlib, but I 1) have some minor
problems and 2) want to know what others think about this.
I'm a native git user and I don't know how to use svn properly. So I
try everything to avoid svn. Furthermore, I like git so much that I
don't want to give it up when developing for matplotlib.
As is well-known, there *is* already a git mirror for mpl, using
svnmerge.py, i.e., http://github.com/astraw/matplotlib. Anyway, this
repo seems to be not actively maintained for monthes. The last comit
on branch trunk is from Nov 12, 2010.
Yesterday I tried git-svn on the matplotlib sf repo, and it took quite
a long time (already ~500 MB), but it stopped with some error message:
RA layer request failed: REPORT of
'/svnroot/matplotlib/!svn/vcc/default': SSL negotiation failed:
Connection reset by peer (https://matplotlib.svn.sourceforge.net) at
/usr/local/libexec/git-core/git-svn line 5061
I could imagine the sf server treated me as some DoS user.
I attach a part of the log of how I initialised the git repo (without
the middle part), and also some tees of $git branch -a and $git log
trunk | head -n 150.
I realised that I used different options to git svn init (i.e., I used
--std-layout) than stated on
http://matplotlib.sourceforge.net/devel/coding_guide.html#using-git,
but I cannot see why I should use --trunk=trunk/matplotlib
--prefix=svn/. From the logs of $git svn fetch, it looks good.
If there is no feedback until today eve here in Germany (in ~6 hrs),
I'll try again today evening to $git svn fetch some more of the repo.
If there is positive feedback, I'll consider writing to the github
guys to give me ~2 Gigs of storage for the mirror. If there is
negative feedback, I'll consider giving the project up. Note, that it
is inevitable for me to publish the mirror when Ben and I want to use
it (for some project we have since a few monthes on mpl).
I would suggest to always put git changes *on top* of svn changes, so
no use of $git merge trunk, but always $git rebase. This is the only
way to make usable diffs which can go in into svn on sf as far as I
can see.
There is a general problem which will pertain all git users: Once the
changes went via svn into the sf repo, they reappear on the github
mirror, causing conflicts in the branches on github where they
originally came from. The solution to this would be clear, but I
think there will be no way to get a consensus to switch from svn to
git on mpl completely.
Friedrich
01.git-svn-fetch.part.log (6.89 KB)
01.git-branch-a.log (1.3 KB)
02.git-log-trunk.part.log (5.53 KB)