On 3/17/09, Gerard Krol wrote:
> Hello everyone,
>
> I'm still a little sad that we didn't switch to Git. However, I made it
> possible to use both Git and SVN.
>
> Anyone who wants to crawl out of the SVN pit is welcome to clone
> git://gitorious.org/warzone2100/mainline.git
> If you have any interesting commits in your public repository I will
> pull from you and commit them to SVN, where they will end up as being
> committed by mr. Git SVN Gateway. A From: line at the bottom will show
> the original author.
>
> Any commits from SVN will also show up in the mainline repository, so
> you can pull/fetch from there to keep up to date with the work being
> done in SVN. Keep in mind that it is a manual process (I have to be able
> to resolve any merge conflicts) so it might lag behind a day or two.
>
> One of the problems is that I'm the only one that can operate the
> gateway (as you can't clone a git-svn repository). This could be solving
> by hosting the repository on a server somewhere, where developers could
> login to run the script and fix merges.
>
Hey Gerard,
When you did the initial import from GNA to your git stuff, it don't
seem to follow the EOL styles of what what was set for the files by
svn.
As it is now, without any converting on my end (so it won't conflict
with doing a git diff ) basically, anything that is a txt file or has
readable txt (XML files) are screwed up.
This means everything in data/ is fubared, which makes comparing
things I have done with svn pretty much impossible.
If I have autoconvert on (which is frowned upon), then some things are
ok, but others are still wrong.
Also, as I understand it, if I do a git push, then you would have to
review it, before you use the gateway script to commit it on GNA
right?
P.S, gitorious is at least 1000% faster than GNA.
___
Warzone-dev mailing list
Warzone-dev@gna.org
https://mail.gna.org/listinfo/warzone-dev
