Clan x86

Technical (Development, Security, etc.) => JavaOp Board => Topic started by: Joe on February 23, 2011, 01:39:08 am

Title: Git Repository Information
Post by: Joe on February 23, 2011, 01:39:08 am

What?! The project isn't dead?! No you fool! At least not this week!

I'm using Git for all of my school stuff and I like the system a lot better than SVN. Therefore, if I want to work on JavaOp without SCM getting in the way (at least, as little as possible), I need to use Git. K? K.

Github is a site that offers free hosting of public repositories, or for-pay hosting of private repositories. You can find JavaOp2 here (https://github.com/wjlafrance/javaop2), with instructions to check it out. As usual, if you feel you should have commit rights to the project, contact me.

The SVN repository (http://forum.x86labs.org/index.php/topic,14315.0.html) will remain available as long as Google exists.

Title: Re: Git Repository Information
Post by: deadly7 on February 23, 2011, 02:57:11 pm

You can also use git to clone an SVN repo..

Title: Re: Git Repository Information
Post by: Joe on February 23, 2011, 04:58:13 pm

I found that to be particularly neat. All the commits (https://github.com/wjlafrance/javaop2/commits/master) were saved from Google Code. :)

Title: Re: Git Repository Information
Post by: deadly7 on February 24, 2011, 01:27:25 am

Quote from: Joe on February 23, 2011, 04:58:13 pm

I found that to be particularly neat. All the commits (https://github.com/wjlafrance/javaop2/commits/master) were saved from Google Code. :)

You're misunderstanding. The syntax is "git svn init <svn-url>"  and then you can use git without making a new repository. It's pretty handy because you can work it with both svn and git.

Title: Re: Git Repository Information
Post by: Joe on February 24, 2011, 05:13:21 pm

Ooh! I like.

Title: Re: Git Repository Information
Post by: deadly7 on February 24, 2011, 06:53:58 pm

Quote from: Joe on February 24, 2011, 05:13:21 pm

Ooh! I like.

Yeah. Git is ridiculously powerful. Just has funny syntax.
svn update === git svn rebase

and to commit you do the usual
"git add"
"git commit" [or git commit -m]
"git dcommit" to submit things on your local branch to the master.

Branching with git/svn is much more a PITA and usually not worthwhile, in my experience

Title: Re: Git Repository Information
Post by: Sidoh on February 24, 2011, 08:10:34 pm

If you're working alone, branching is awesome.  If you're starting on something you know could fuck things up, it makes it easy to revert to a stable state.  Of course you can do that without branching, but it certainly makes it a little easier.

I've also had a little experience using branching with subversion on a project with about half a dozen developers.  It works really well, as long as there aren't too many changes to the same file.

Title: Re: Git Repository Information
Post by: iago on August 08, 2012, 03:14:50 pm

Is it safe to delete my old javaop svn stuff? I'm cleaning up my svn server right now, will get rid of it if it's safely in git.

Title: Re: Git Repository Information
Post by: Joe on August 12, 2012, 01:45:52 pm

Yep