Collectible Card Game Headquarters

i . . . don't know what to say. i guess i'm glad i finally learned to use git in a team environment. nothing can change that now.

here is a logical comparison.

svn positives:

• as Rob mentioned, administration is probably easier here at slightlymagic.
• it has beautiful centralized rev numbers.
• subclipse's integration with slightlymagic will probably be better than egit's integration with gitorious.
• svn probably doesn't need a separate client (like SmartGit).
• i can try git-svn if i want to do some branching or if svn seems too slow.

git's advantages:

• git is very fast.
• it is much cleaner to do branching in git.
• we have detailed documentation for using git. i do not know when i will have the personal energy necessary to document our subversion use to the same level of detail. someone else will probably have to do it.
• SmartGit is smart.

perhaps it would be better to ask other committers. {funnier if i call them pushers}. i don't really want to vote, because i do not know when my participation is going to taper off.

Chris H. wrote:When we run forge from Eclipse the deck file for JuzamjediCube.dck changes. If during an Add we include this file unintentially, is there a way that we can revert this one file to the version of this file located at Gitorious cardforge master?

between Add and Commit? yes. do a Hard Reset on the one file, destroying your working changes to it only.

edit: it's even easier in SmartGit. browse to JuzamjeduCube.dck, click on it, then click the Local menu, then Discard.

Chris H. wrote:It seems to me that this could at times be a useful way to back out of a mistake without having to re-install.

re-install?

Braids wrote:between Add and Commit? yes. do a Hard Reset on the one file, destroying your working changes to it only.

`
What should we use prior to an Add? Hard Reset? After a commit but before a Push?

Oh, the Hard Reset seems to require that we highlight the ForgeGit master folder and is not active if we select a file within the project.

Is there away to only revert a single file? This would allow us to keep another changed file that is OK in our local copy.

I can go either way, SVN or Git.

Git might be more obvious and less hidden from public view than the propsed SVN.

Chris H. wrote:

Braids wrote:between Add and Commit? yes. do a Hard Reset on the one file, destroying your working changes to it only.

`
What should we use prior to an Add? Hard Reset? After a commit but before a Push?

your question is odd, which makes me want to clarify how git works. a file has multiple states within Git: untracked, tracked+unmodified, tracked+modified, staged, committed locally, and pushed. there are others, but they are obscure.

• after a fresh clone or pull operation, most files are in the tracked+unmodified state.
• creating a new file or directory in the working folder places them in the untracked state.
• editing a tracked+unmodified file turns it tracked+modified.
• adding an untracked file makes it staged.
• also, adding a tracked+modified file makes it staged.
• if memory serves correct, adding an untracked directory causes all of its contents to be recursively staged as well.
• committing an untracked file, a tracked+modified file, a staged file, or any directory causes it to be committed locally.
• all the files and directories that were committed at one time are packaged into a unit called a commit. the commit is the "unit of transport" for a push or pull.
• pushing any number of commits causes them to be pushed, which is another way of saying they have been committed remotely.

pushing and pulling are the same operation, just in different directions. they both attempt to send and apply recent commits in one repository (your local clone or gitorious) to the other.

does that help?

Chris H. wrote:Oh, the Hard Reset seems to require that we highlight the ForgeGit master folder and is not active if we select a file within the project.

Is there away to only revert a single file? This would allow us to keep another changed file that is OK in our local copy.

you may have missed my previous edit. SmartGit has a delightful feature called Discard, which discards (resets) all your changes to a single file.


the only thing i've found EGit better than SmartGit at is reversing commits. even then, i think it's just a matter of education.

Thank you for the explanation. I suspected that the Hard Reset would revert all of my changed local files at any place between the file(s) saved with edits all the way to right before a push to Git.

I want to spend some more time getting used to SmartGit. It looks like SmartGit can revert a single file while EGit may need to do it via a command other than Hard Reset (Team -> Replace With -> HEAD Revision ?).

Chris H. wrote:Thank you for the explanation. I suspected that the Hard Reset would revert all of my changed local files at any place between the file(s) saved with edits all the way to right before a push to Git.

yes, it is my belief that hard resets can vaporize local commits. (i think snacko says you can actually find the commit somewhere, but i have no evidence.)

Chris H. wrote:I want to spend some more time getting used to SmartGit. It looks like SmartGit can revert a single file while EGit may need to do it via a command other than Hard Reset (Team -> Replace With -> HEAD Revision ?).

yes, that EGit command should do it. nice job!

the local HEAD is the local commit (plus history) that Git is currently showing. each repository has a HEAD; the remote repository's head is usually called origin/master. (actually, each branch has a head, but let's just pretend that each repository only has a main/master branch.)

Braids wrote:yes, it is my belief that hard resets can vaporize local commits. (i think snacko says you can actually find the commit somewhere, but i have no evidence.)

This is true. I forget exactly where in .git it is, but you can find old commits. The 'git gc' command clears them out.

Since I've used tortoiseSVN for SVN and tortoiseGit for Git and they are pretty similar, I can live with both SVN and Git.

Sloth wrote:Since I've used tortoiseSVN for SVN and tortoiseGit for Git and they are pretty similar, I can live with both SVN and Git.

I use the pair as well, so I'm comfortable enough with either direction.

Can anyone do a pull from gitorious? I am getting "Permission Denied" errors. I have not changed anything. Strange.

Braids wrote:i . . . don't know what to say. i guess i'm glad i finally learned to use git in a team environment. nothing can change that now.

No doubt this is a good learning experience... these are the sorts of things we don't learn in school, and unless you work in a corporate environment, SCC isn't usually a necessary skill. Even in my corporate environment, SCC is a non-issue, though I'm leaning towards wanting to begin an SVN server since Visual Source Safe sucks....

[*]it has beautiful centralized rev numbers.

You want the version number to be more prominent in the bug reporting? Hex codes won't cut it.

[*]git is very fast.

Except when it can't merge and it surrounds the entirety of two versions of a file as changed, and I have to hunt down the differences. Then, I painfully weep, as I manually merge files I didn't even change in the first place....

[quote[*]we have detailed documentation for using git. i do not know when i will have the personal energy necessary to document our subversion use to the same level of detail. someone else will probably have to do it.[/quote] Strangely, we never NEEDED this level of documentation for SVN. We're grateful for the effort, documentation is always the un-fun part.

[*]SmartGit is smart.

If they're so smart then why haven't they integrated into eclipse?

because i do not know when my participation is going to taper off.

Think about how much time you've spent trying to make git work and documenting it. It's just distracting you from the fun stuff, coding up new functionality.

edit - Dave, I don't know about permissions, but EGit caught an exception, but no clear description about why.

jendave wrote:Can anyone do a pull from gitorious? I am getting "Permission Denied" errors. I have not changed anything. Strange.

NM. I re-cloned and it looks fine.

jendave wrote:Can anyone do a pull from gitorious? I am getting "Permission Denied" errors. I have not changed anything. Strange.

`
I am getting the same thing on my end. There is a link to Show Error Log displayed in the Problem Occurred dialog and this might make some sense to someone with more tech ability than myself.

Chris H. wrote:

jendave wrote:Can anyone do a pull from gitorious? I am getting "Permission Denied" errors. I have not changed anything. Strange.

`
I am getting the same thing on my end. There is a link to Show Error Log displayed in the Problem Occurred dialog and this might make some sense to someone with more tech ability than myself.

`
I am trying to do a pull from SmartGit. It displays the SSH Authentication dialog. The path to my Private Key File looks OK:

/Users/myaccount/.ssh/id_dsa

I type in my passphrase and click on Login and do this repeatedly. It is not being accepted. The SSH Authentication dialog is displayed once again and asks for the passphrase. I wonder if this is related to the recent problem with Eclipse not being able to do a pull.