Why using git would be awesome for nexuiz

Developer discussion of experimental fixes, changes, and improvements.

Moderators: Nexuiz Moderators, Moderators

Postby divVerent » Sun May 24, 2009 10:42 am

This can be done just as well with git-svn.

All the arguments pro git you bring also apply if git-svn is used on a svn master repository.

And as long as this is the case, I see no single reason to switch SCM.
1. Open Notepad
2. Paste: ÿþMSMSMS
3. Save
4. Open the file in Notepad again

You can vary the number of "MS", so you can clearly see it's MS which is causing it.
divVerent
Site admin and keyboard killer
 
Posts: 3809
Joined: Thu Mar 02, 2006 4:46 pm
Location: BRLOGENSHFEGLE

Postby C167 » Sun May 24, 2009 11:09 am

divVerent wrote:LOL.

Someone has to check it, or the code base gets as bad as it once was again, with commits by people I won't name here.

Which is why I maintain that "stable branch" of Nexuiz.
Well, then you want to practice what Linus does with the linux kernel? devs send him pull requests or patches per mail and he integrates them if he thinks they are okay. This is one of the development ways git was made for...
C167
Member
 
Posts: 29
Joined: Wed Oct 31, 2007 5:24 pm

Postby divVerent » Sun May 24, 2009 11:15 am

But I am already doing this with svn.
1. Open Notepad
2. Paste: ÿþMSMSMS
3. Save
4. Open the file in Notepad again

You can vary the number of "MS", so you can clearly see it's MS which is causing it.
divVerent
Site admin and keyboard killer
 
Posts: 3809
Joined: Thu Mar 02, 2006 4:46 pm
Location: BRLOGENSHFEGLE

Postby C167 » Sun May 24, 2009 11:47 am

i know :-)
As i've never done that, i don't know if it may be easier with git, at least, the individual commits including their commit message does not get lost. if someone merges the revs from a different repo, the commits stay untuched, and if there are merge conflicts, the commit that commited the merge includes the changes, but it is an additional commit, so stuff does not get merged with the last commit from the other repo. and, git has ways to import a complete mbox full of patches.

cause currently, it is not clear who made the code (unless you say it in the commit message), and blame does not know either, cause such commits are commited by you.

Additionally, one gets single patches for each commit when issuing git format-patch <rev> which is also quite handy, as they contain everything needed including the hash, so no one can change something in it without modifying the hash. such a commit can be seen here.
Last edited by C167 on Sun May 24, 2009 11:55 am, edited 1 time in total.
C167
Member
 
Posts: 29
Joined: Wed Oct 31, 2007 5:24 pm

Postby alpha » Sun May 24, 2009 11:52 am

No one wants git, case closed.
quit for good
alpha
Alien trapper
 
Posts: 492
Joined: Tue Jun 17, 2008 7:18 pm

Postby [-z-] » Sun May 24, 2009 12:09 pm

alpha wrote:I don't want git, case closed.
[-z-]
Site Admin and Nexuiz Ninja
 
Posts: 1794
Joined: Mon Nov 13, 2006 12:20 am
Location: Florida

Postby Psychcf » Sun May 24, 2009 10:53 pm

Woah, everyone went crazy while I was gone.

Let me just re-iterate this point... I notice a lot that people are doing more and more 3rd party mods (myself included), and I'm just suggesting that git would make merging said changes a lot easier, and would encourage people to get their work into the main repo.

Also, we don't need to choose between one or the other! Git-svn allows us to keep an SVN repo and a git repo in sync with each other, so those who still want SVN can stick with SVN, while everyone willing to try something new can use Git.
Psychcf
Forum addon
 
Posts: 1554
Joined: Sun Dec 03, 2006 11:38 pm
Location: NY, USA

Postby tundramagi » Mon May 25, 2009 2:20 am

Psychcf wrote:Woah, everyone went crazy while I was gone.

Let me just re-iterate this point... I notice a lot that people are doing more and more 3rd party mods (myself included), and I'm just suggesting that git would make merging said changes a lot easier, and would encourage people to get their work into the main repo.

Also, we don't need to choose between one or the other! Git-svn allows us to keep an SVN repo and a git repo in sync with each other, so those who still want SVN can stick with SVN, while everyone willing to try something new can use Git.


I like the mutator you made. Please keep on it! It's really good and is almost done (and it WORKS!) (I tried it out.)
tundramagi
Forum addon
 
Posts: 974
Joined: Sun Jan 04, 2009 4:53 pm

Postby divVerent » Mon May 25, 2009 10:25 am

Psychcf wrote:Woah, everyone went crazy while I was gone.

Let me just re-iterate this point... I notice a lot that people are doing more and more 3rd party mods (myself included), and I'm just suggesting that git would make merging said changes a lot easier, and would encourage people to get their work into the main repo.

Also, we don't need to choose between one or the other! Git-svn allows us to keep an SVN repo and a git repo in sync with each other, so those who still want SVN can stick with SVN, while everyone willing to try something new can use Git.


But you already can use git-svn! So what's your problem?
1. Open Notepad
2. Paste: ÿþMSMSMS
3. Save
4. Open the file in Notepad again

You can vary the number of "MS", so you can clearly see it's MS which is causing it.
divVerent
Site admin and keyboard killer
 
Posts: 3809
Joined: Thu Mar 02, 2006 4:46 pm
Location: BRLOGENSHFEGLE

Postby parasti » Mon May 25, 2009 11:22 am

It seems people don't really understand how git-svn works. It can't abstract an SVN repo so it looks like just another Git repo, and it definitely can't be used to access a Git repo as an SVN repo. git-svn is basically a very advanced SVN client with offline history, interactive rebase, hunk staging, bisection, etc, but with its history rewriting it makes interaction with other Git (and git-svn) repos very frustrating, unless you know a lot about Git and how git-svn works internally.
parasti
Alien
 
Posts: 110
Joined: Sun May 11, 2008 11:32 pm
Location: On the walls and the ceiling

PreviousNext

Return to Nexuiz - Development

Who is online

Users browsing this forum: No registered users and 1 guest

cron