Collectible Card Game Headquarters

Braids wrote:SmartGit is available for Windows, Mac, and Linux. it is free for non-commercial use. and it's made in Germany. talk about coincidence.

it is a little difficult to install, but i documented the windows installation. it works with EGit for the most part. it handles Pull conflicts well. it prefers to be the push mechanism as well. as long as you remember to refresh your Eclipse project after working with SmartGit, things seem just fine.

best part is, because it is multi platform, we only have to write one set of instructions. ok, there are deviations in some places.

`
I have installed this on my Mac. I updated the wiki and it now includes some Mac related info.

Chris H. wrote:

Braids wrote:SmartGit is available for Windows, Mac, and Linux. it is free for non-commercial use. and it's made in Germany. talk about coincidence.

it is a little difficult to install, but i documented the windows installation. it works with EGit for the most part. it handles Pull conflicts well. it prefers to be the push mechanism as well. as long as you remember to refresh your Eclipse project after working with SmartGit, things seem just fine.

best part is, because it is multi platform, we only have to write one set of instructions. ok, there are deviations in some places.

`
I have installed this on my Mac. I updated the wiki and it now includes some Mac related info.

well done, Chris. thanks for helping out!

Rob Cashwalker wrote:Dave, shouldn't we lock down the gitorious repo? Or is it still a matter of testing slightlymagic beforehand?

edit - just for kicks, I pulled the SVN repo from here, and it is going a lot faster than google ever did.. so much for cloud computing...

Unfortunately, after running the upload to SVN for more than 24 hours, the process hung. I have not been able to complete it. The SVN repo is only at the 9704th commit so it still had a few more hours to go. Considering that the SVN upload has taken about considerably longer (about 7x longer) than the Git upload, I have reservations about redoing it.

Here are the options oof the top of my head -

Try to figure out how to restart the historical upload into SVN (will take quite some time).
Simply put the the code into SVN without history.
Stay with Git, put the releases, snapshots into ftp.cardforge.org (Rob wasn't there bandwidth concerns? No idea where to put the Maven report site)
Stay with Git and put the Maven reports, snapshots and releases into SlightlyMagic SVN (I like this idea actually)

it case you hadn't noticed, i have been trying to race you, by beefing up the git tools and documentation.

this is something that would not be tolerated well on a commercial project. interesting. . .

Back when we first thought of git, I had left my laptop on over night trying to copy the google SVN to a local git and it never completed successfully... now you're experiencing the opposite sort of problem.

Goblin Hero had asked if I had an archive of the SVN repo that he could seed the project with. If your local SVN folder has all the data necessary, then this would be an option. One upload instead of all the revisions... keep in mind some of those revisions affected thousands of files at once, like the couple times we modified the cardname.txt structures....

Barring that, is the SVN history critical? I don't think so... if the history were dumped to a text file, and included for historical purposes, folks could read everything that's been changed since revision 0, IF they needed to. It would be nice to be able to jump start the revision numbers, so that there's no overlap... then how do the git revisions get numbered when merged with the SVN?

Forge is really almost a different project than when the google SVN was started.

No bandwidth issues, cardforge.org is unlimited now, but it's just not the fastest responding server....

Seriously, on a going forward basis, slightlymagic.net is plenty fast, downloading what did succeed, was lightning fast. When I would update from google, I'd get a couple card files per second listed. From here, they were scrolling by quicker than I could read them.

jendave wrote:Unfortunately, after running the upload to SVN for more than 24 hours, the process hung.

I think I know why it happens - weekly log rotation and apache restart on server

jendave wrote:Here are the options oof the top of my head

Or just give me your SVN and I'll put it on server manually.

If we do not need history, I can put everything into slightlymagic svn. That should not be a problem. What is the final decision though? SVN or Git?

Dave, what if you attempted to run a local SVN server, ran your process, then zipped the resulting repo to Goblin Hero?

Rob Cashwalker wrote:Dave, what if you attempted to run a local SVN server, ran your process, then zipped the resulting repo to Goblin Hero?

Argh. Rob, why did you have to come up with a good idea? I'll give it a try.

Braids wrote:it case you hadn't noticed, i have been trying to race you, by beefing up the git tools and documentation.

this is something that would not be tolerated well on a commercial project. interesting. . .

Funny thing is that I would like to stay with Git actually, except where the release artifacts are concerned (release, snapshots and Maven reporting). Rob can you outline the direction for source control? What are your criteria for the preferred solution?

At this point, I can set up the pom.xml file to put releases and snpashots onto ftp.cardforge.org. The Maven Reports can go into svn.slightlymagic.net. The source code will go to Git or SVN?

My only requirement for SCC is simplicity... SVN in eclipse is super simple and smooth. EGit has been nothing but headaches for me. External tools just make it more complicated, while they may be more superior in function.

Then there's management - Users need to join gitorious, pm us for membership, then we have to login there, then navigate to the project page to add them to the list. Here, it's their existing login, we just add them to the dev group.

The reports can go on cardforge too, can't they?

Rob Cashwalker wrote:My only requirement for SCC is simplicity... SVN in eclipse is super simple and smooth. EGit has been nothing but headaches for me. External tools just make it more complicated, while they may be more superior in function.

Then there's management - Users need to join gitorious, pm us for membership, then we have to login there, then navigate to the project page to add them to the list. Here, it's their existing login, we just add them to the dev group.

Understandable. Since I primarily use the command line for git and svn, I rarely see the issues with the Eclipse plugins.

Rob Cashwalker wrote:The reports can go on cardforge too, can't they?

Sure. Since the site is static html, how should it be uploaded? I only have access to ftp.

It can't go by ftp?

Rob Cashwalker wrote:It can't go by ftp?

I don't think I was very clear. Maven can upload the site via ftp of course. Is the ftp directory the desired location for web content? Should I put it into a certain directory so it can be served via the cardforge.org site?

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?

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