Development > Newbie Coding

The GIT problem

(1/9) > >>

Duke:

--- Quote from: Destructavator on October 05, 2010, 04:50:46 pm ---I have to agree - I think the move from SVN to Git was a mistake, ...

--- End quote ---
Emotionally, I agree with much of what Destructavator wrote in the above post. But let's face the facts. It doesn't help us to discuss how the move could have been done better, later or at all.
We *have* moved to GIT.

It's a classical deadlock:
- Mattn *needs* GIT to merge branches
- many other teammembers and contributers strongly dislike GIT for the inconvience or even ran into serious problems and are nearly *disabled* (and not just Windoze users).
We're stuck. We can't simply move in either direction. We must solve at least the serious problems to get going again.

Such a situation automatically becomes the *#1 priority of the project*. I'd like to see everybody to do whatever he can to help resolving the problems. Don't stand aside.

So let's first collect the *serious* problems. I'm not talking about inconvenience, just *showstoppers*. I only see a few:
SVN:
- merging branches
afaik Mattn is the only one who does this work, but everyone else relies on this work. We need Mattn for more important things ;)

GIT:
- stashing
I don't mean the inconvenience of a few clicks around an upbase. I need a modified .cproject, .project and ufo.rc just to compile. I have no nice idea how to separate these from the actual changes in the source.

- clone
The devs will sooner or later get their clone, but for a *new* contributor the 1.6 GB plus the learning of GIT is too much of a hurdle for most of the potential contributors imho.


For the solutions I'll start separate topics for each problem. I can also imagine a dedicated board for 'GIT problems & solutions'. And YES, there will also be a topic 'GIT convenience problems' ;)

But before starting to talk about solutions: does anyone see more problems that classify as 'showstoppers' ?

Destructavator:
I see a few "showstopper" issues right off the bat, although I'm going to attempt to list a few potential solutions rather than just bitch and whine about them:

- First, The official Git software for Windows doesn't work on my system - I've given it more testing and it repeatedly produces hard disk write errors, as well as destabilizing the system sometimes.  I've already been forced to restore the hard drive partition from a backup once already.

For solutions, is there another software package for Windows that can do the same thing?  Another thought, one that I really should have thought of before, is that I multi-boot some of my systems, and I could try accessing the Git repo for this project when Ubuntu is up and running.  This might work, but would still be inconvenient because most of my design software is for Windows, so I'd have to shut everything down and re-boot to Ubuntu to update or commit changes.

- Second, Even if I don't make any changes to any files at all, or if I get a read-only copy downloaded (I've tried both), I can only get updates for a master branch once or twice before it refuses to update anymore and spits out errors saying it won't do it.  The only thing that works at that point is to delete the whole working copy and start over from scratch by re-downloading the whole entire thing all over again, which on my DSL connection takes a number of long hours.

I can't think of a solution to this one other than fixing the first issue first, which may result in this second issue going away - I really don't know.

Side Note:  Does the *whole* *entire* system absolutely *have* to be in Git?  Could we leave the Data Source in SVN, or even have just the source code in Git?  If if was split than artists and other non-coders could very easily contribute and update their stuff, while the coders would have the code in Git and do what they need to there.  Also, since we have the auto-build bot system now, a non-coding artist could test their changes with recent code by grabbing the built binaries, and not have to bother with Git software at all.  Such a contributor would not need source code anyways.

Crystan:

--- Quote from: Destructavator on October 07, 2010, 02:22:57 am ---Side Note:  Does the *whole* *entire* system absolutely *have* to be in Git?  Could we leave the Data Source in SVN, or even have just the source code in Git?  If if was split than artists and other non-coders could very easily contribute and update their stuff, while the coders would have the code in Git and do what they need to there.
--- End quote ---

That were exactly my thoughts when i noticed the first time that git is total shit for artist stuff. ;) But i thought ppl would dislike the idea.

H-Hour:
Git isn't shit for artists. I'm sorry but there's nothing that's more difficult in GIT than it was in SVN except the initial setup. Comitting is just as easy. And GIT is not a barrier to new art contributors simply because new art contributors don't start by making their own commits anyway.

Destructavator, the file I downloaded for GIT was Git-1.7.0.2-preview20100309.exe. Is that what you've been using? I then downloaded TortoiseGit-1.5.3.0-64bit.exe, but as I said, I don't use that for any of the setup. Use the GitBash interface so that you can put the commands in directly.

Second, also for Destructavator or anyone else, what are the errors you get? I've searched the IRC logs but haven't found any specific errors mentioned. Mattn or Tron will need these in order to help you work through them. Commands like git status and git log can be helpful to get a sense of what's happening on your local repository.

Duke:
@Destructavator:
I'm using Git-1.7.2.3-preview20100911 and have to say that it seems to 'work as designed'. I could do a few commits (assisted by Mattn) and quite some fetches without screwing anything else.
It often refused to do what I *wanted*. but I didn't see anything that would classify as a bug.

Also, I wouldn't expect a software like GIT to go down to a level where it can cause HD problems. But you'll never know...

I don't trust TortoiseGit, though. This SW seems very immature to me. And the attempt to be a bit like SVN and a bit like GIT has failed imho. Well, it exploded here two days ago anyway...

Has anyone tried GIT GUI ? It looks usable. If I could only make it talk english again.

Navigation

[0] Message Index

[#] Next page