[Rails-devel] Are we ready for Git?

[Erik V. <eri...@xs...>]

To all committing developers, in particular Stefan,

Brett and I have been discussing off-list if it could be the right time to move from SVN to Git as a code repository on Sourceforge.  You may remember that Brett already had prepared a Git repo several months ago.  The Egit add-on for Eclipse now seems to be good enough to be used for that purpose.  I have given it a try yesterday, and although I have not tested all required actions yet, so far it looks fine to me.

I have started this discussion now because I'm fed up with SVN (or perhaps rather: the Subversive plug-in to Eclipse).  I have had too many problems recently (see below for the most recent one - I found that Git allows to ignore .gitignore). 

With Git, each developer has its own repository.  I expect that to be an real benefit, as I will be able to make multiple snapshots, and even can branch locally, without bothering the central repository until all aspects of a new feature are OK.  The only bad news is, that three actions are required to distribute a change: Add, Commit and Push. 

I'm all for it.  What about you?

Erik

> -----Original Message-----
> From: wak...@gm... [mailto:wak...@gm...] On Behalf Of
> brett lentz
> Sent: Friday, July 08, 2011 11:18 PM
> To: Erik Vos
> Subject: Re: svn:ignore in repository??
> 
> Fine by me. I'll turn the sf.net git repository back on this weekend and push
> our current SVN repo into it.
> 
> Do you want to start a new "Let's move to Git" thread on rails-devel, so we
> can inform everyone of the change?
> 
> I've been using Git heavily at work for the last 2 years, so I'm pretty familiar
> with it. There's some important differences that you'll want to be aware of.
> Probably the biggest difference that you'll see immediately, is that Git
> revisions the *whole* repository, unlike CVS and SVN which maintain
> discrete versions for each file.
> This means that things like branches, merges, etc. all operate on a per-
> repository basis.
> 
> Here's some resources on getting up to speed with Git. Read the first one,
> especially.
> 
> http://tom.preston-werner.com/2009/05/19/the-git-parable.html
> http://book.git-scm.com/
> http://www.gitready.com/
> http://www-cs-students.stanford.edu/~blynn/gitmagic/
> http://git.or.cz/gitwiki/GitCheatSheet
> http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html
> 
> 
> ---Brett.
> 
> 
> 
> On Fri, Jul 8, 2011 at 1:42 PM, Erik Vos <eri...@xs...> wrote:
> > Hmm, now I first had a conflict, and after I managed to fix that with
> Tortoise, SVN keeps insisting on committing svn:ignore to the repository!
> >
> > I suppose this started after I installed a new version of Subversion (I think
> 1.6) when I had problems a while ago.
> > It turns out that (at least in this version) svn:ignore is a *versioned*
> property, in other words: it is *supposed* to be in the repository!
> > See http://svnbook.red-bean.com/nightly/en/svn.ref.properties.html .
> >
> > I find this ridiculous, and to me it's another nail in the coffin of SVN.  Guess
> it's time to install Jgit/Egit.
> >
> > Erik.
> >
> >> -----Original Message-----
> >> From: wak...@gm... [mailto:wak...@gm...] On Behalf Of
> >> brett lentz
> >> Sent: Friday, July 08, 2011 7:18 PM
> >> To: Erik Vos
> >> Subject: Re: svn:ignore in repository??
> >>
> >> I've removed the svn:ignore property. Hopefully that helps. :-)
> >>
> >> ---Brett.
> >>
> >>
> >>
> >> On Fri, Jul 8, 2011 at 8:15 AM, brett lentz <bre...@gm...> wrote:
> >> > Sounds like somebody committed their version of the file to the
> repository.
> >> >
> >> > I'll see if I can fix that.
> >> >
> >> > ---Brett.
> >> >
> >> >
> >> >
> >> > On Fri, Jul 8, 2011 at 4:02 AM, Erik Vos <eri...@xs...> wrote:
> >> >> Brett, I don't know if you can help me with the following:
> >> >>
> >> >> Commits have started to fail because there is a difference between
> >> >> svn:ignore locally and remotely in the root directory.  Indeed I
> >> >> gave added some files to it.
> >> >> I can fix that easily by removing the root from the commit, but
> >> >> the difference keeps showing up when I synchronize, and I can't
> >> >> clean that
> >> up.
> >> >>
> >> >> The main thing, though, is that I completely don't understand what
> >> >> business svn:ignore has of being in the repository at all.
> >> >> Shouldn't that just be a local file only?  Can that be fixed?
> >> >>
> >> >> Erik.
> >> >>
> >> >>
> >> >>
> >> >>
> >> >
> >
> >