does dmca push us further toward distributed rev control?

[Chris H.]

I have noticed something strange about my commits. Committing brigs up a Commit Changes window. I changed the Author and Committer text boxes from accountname to loginname. This edit will still be there on the next launch.

I changed the <accountname@###.###.#.##> to the email address that I use for gitorious. When I restart Eclipse this edit reverts and is only temporary.

Does anyone have any ideas?

try using a text editor to edit the hidden file .gitconfig in your home directory. change the name and email fields to the ones you use for gitorious.

if this works for you, would you mind editing the guide?

`

I followed your advice and it works. I made sure to quit Eclipse and then re-launched and the name and email was correct and did not revert. Thank you.

The other devs might want to take a look at their .gitconfig file. Correcting this file may get rid of those "Merge branch 'master' of gitorious.org:cardforge/cardforge" in the commit logs and will take care of a couple of other issues.

[Braids]

Ah, a Personal clone is like Braids trunk build on the SVN . . .

you mean, like the braids-minimax branch on the SVN?

. . . except that the Personal clone is located on your own computer at not at the server farm at google.

the analogies are imperfect at best. a local clone is like an svn working directory. instead of updating, you pull. instead of committing, you commit and push.

a remote clone is more strange. it is like something between a working directory and an svn branch. to make things more confusing, i'm pretty sure git supports formal branching as well.

if i understand correctly, git is mainly concerned about the distribution and application of patches/deltas. these patches can be applied in an orderly way among any number of repositories and git branches. each repository keeps track of what patches have been applied to it. that's what makes it distributed. each clone is a clone of the entire history.

Snacko, am i grasping this correctly?

[Snacko]

Let's get this straight
just .git = bare repository -> contains all data and history
all the files you get from 'git checkout .' -> working directory
pull = fetch & merge -> get changes (tags/branches) from a selected remote repository (can be multiple) and update working copy
commit = like svn commit but updates local repository
push = move all / selected branches/tags from your local repository to some remote repository

this means you can edit your commits / rearrachnge / squash / delete before you push them. This allows for revisioned history, but you can correct anything before you push it upstream. You don't have to push right after commit. You can let some changes pile up and send them all at once or revise them before sending.

git has all the history available locally (you don't have to querry the server for anything ex. git blame or git log), it is stored in your .git directory; this means each copy of a repository is at least equivalent and someone could clone from you and would get a good copy of the repo

remote clone = like a second svn reposiotry; gitorious uses bare repositories so there's no working copy

branching = like svn branching but better!, even if you don't know about it you already have a local branch 'master' which gets merged when there are changes and you get "Merge branch 'master' of gitorious.org:cardforge/cardforge" message; this means that a fast forward merge took place; those are completely automatic and replay changes in your local working copy

Image visualizing Forge git history:


If you aren't scared of command line you might want to read the official git tutorial which covers the basics http://www.kernel.org/pub/software/scm/ ... orial.html

[Chris H.]

To the HowTo contributors. You may want to include a section on actually building Forge using this Maven deal...

`
I am still learning and do not have enough info to be of much use, but I have figured out a couple of things. What info we have can be found on Eclipse and Maven.

Have you had any luck so far in getting this Maven thing working?

[jeffwadsworth]

To the HowTo contributors. You may want to include a section on actually building Forge using this Maven deal...

`
I am still learning and do not have enough info to be of much use, but I have figured out a couple of things. What info we have can be found on Eclipse and Maven.

Have you had any luck so far in getting this Maven thing working?

Not yet. I get the following error when attempting to "Maven Install".

| Open

[INFO] --- build-helper-maven-plugin:1.7:released-version (released-version) @ forge ---
[INFO] artifact forge:forge: checking for updates from arcane-maven-repo
[INFO] artifact forge:forge: checking for updates from central
[INFO]
[INFO] --- maven-resources-plugin:2.4.3:resources (default-resources) @ forge ---
[INFO] Using 'ISO-8859-1' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory C:\Users\jeff\git\cardforge2\resources
[INFO]
[INFO] --- maven-compiler-plugin:2.3.2:compile (default-compile) @ forge ---
[INFO] Compiling 343 source files to C:\Users\jeff\git\cardforge2\target\classes
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR :
[INFO] -------------------------------------------------------------
[ERROR] error: error reading C:\Users\jeff\.m2\repository\com\miglayout\miglayout\3.7.4\miglayout-3.7.4.jar; invalid LOC header (bad signature)
[INFO] 1 error
[INFO] -------------------------------------------------------------
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 4.099s
[INFO] Finished at: Sun Jul 24 18:45:40 CDT 2011
[INFO] Final Memory: 5M/93M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile (default-compile) on project forge: Compilation failure
[ERROR] error: error reading C:\Users\jeff\.m2\repository\com\miglayout\miglayout\3.7.4\miglayout-3.7.4.jar; invalid LOC header (bad signature)
[ERROR] -> [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/disp ... eException

[Chris H.]

Not yet. I get the following error when attempting to "Maven Install".

| Open

[INFO] --- build-helper-maven-plugin:1.7:released-version (released-version) @ forge ---
[INFO] artifact forge:forge: checking for updates from arcane-maven-repo
[INFO] artifact forge:forge: checking for updates from central
[INFO]
[INFO] --- maven-resources-plugin:2.4.3:resources (default-resources) @ forge ---
[INFO] Using 'ISO-8859-1' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory C:\Users\jeff\git\cardforge2\resources
[INFO]
[INFO] --- maven-compiler-plugin:2.3.2:compile (default-compile) @ forge ---
[INFO] Compiling 343 source files to C:\Users\jeff\git\cardforge2\target\classes
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR :
[INFO] -------------------------------------------------------------
[ERROR] error: error reading C:\Users\jeff\.m2\repository\com\miglayout\miglayout\3.7.4\miglayout-3.7.4.jar; invalid LOC header (bad signature)
[INFO] 1 error
[INFO] -------------------------------------------------------------
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 4.099s
[INFO] Finished at: Sun Jul 24 18:45:40 CDT 2011
[INFO] Final Memory: 5M/93M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile (default-compile) on project forge: Compilation failure
[ERROR] error: error reading C:\Users\jeff\.m2\repository\com\miglayout\miglayout\3.7.4\miglayout-3.7.4.jar; invalid LOC header (bad signature)
[ERROR] -> [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/disp ... eException

`
Dave put together an instructional guide which is supposed to help get the Maven set up correctly. I installed the Maven connectors and I am getting an error farther along the step by step process.

[Chris H.]

Have you had any luck so far in getting this Maven thing working?

Not yet. I get the following error when attempting to "Maven Install".

| Open

[INFO] --- build-helper-maven-plugin:1.7:released-version (released-version) @ forge ---
[INFO] artifact forge:forge: checking for updates from arcane-maven-repo
[INFO] artifact forge:forge: checking for updates from central
[INFO]
[INFO] --- maven-resources-plugin:2.4.3:resources (default-resources) @ forge ---
[INFO] Using 'ISO-8859-1' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory C:\Users\jeff\git\cardforge2\resources
[INFO]
[INFO] --- maven-compiler-plugin:2.3.2:compile (default-compile) @ forge ---
[INFO] Compiling 343 source files to C:\Users\jeff\git\cardforge2\target\classes
[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR :
[INFO] -------------------------------------------------------------
[ERROR] error: error reading C:\Users\jeff\.m2\repository\com\miglayout\miglayout\3.7.4\miglayout-3.7.4.jar; invalid LOC header (bad signature)
[INFO] 1 error
[INFO] -------------------------------------------------------------
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 4.099s
[INFO] Finished at: Sun Jul 24 18:45:40 CDT 2011
[INFO] Final Memory: 5M/93M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile (default-compile) on project forge: Compilation failure
[ERROR] error: error reading C:\Users\jeff\.m2\repository\com\miglayout\miglayout\3.7.4\miglayout-3.7.4.jar; invalid LOC header (bad signature)
[ERROR] -> [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/disp ... eException

[/quote]
`
Are you up for an experiment?

You should be able to delete your Eclipse, git and workspace folders and start from the beginning again. This will not remove you SSH keys. Then follow these instructions. This worked for me today as I set up a second HD with an older OS system.

Install Eclipse and follow the instructions found in Install Eclipse Software Items (Any OS). Make sure to install Eclipse EGit and m2e - Maven Integration for Eclipse.

Follow the instructions found in Create and Register Your Public-Private Key Pair if you have not yet created and registered your public-private key pair.

In Eclipse, open the File menu and choose Import.... The Import window appears.

Open the Maven category by clicking the plus sign or triangle next to it.

Click Checkout Maven Projects from SCM.

Click Next >.

You will the Checkout as Maven project from SCM. Put in "git@gitorious.org:cardforge/carforge.git" into the location. Install the connectors from the m2e Marketplace. Click on the "Find more connectors from the m2e Marketplace" link in the dialog.

You will see a dialog to install Maven connector components. Please select all of the components and install them. You will need to restart Eclipse. Click Next >.

You will see an Install window, click Next >. Click Next > again after reviewing the items to be installed.

Read the license text(s). Click I accept the terms of the license agreement.

Click Finish. Eclipse should show that it is "Installing Software" in the lower right corner.

You will see a Security Warning. Some of this software is unsinged. Click OK.

You will see a Problem Occurred dialog stating: "An error occurred while installing the items". Click OK.

Clone the Git Repository and then Import the Cloned Repository using the instructions found in How to Get Started Developing Forge guide. A window may pop up asking you to install some Subversive SVN Connectors. You can select and install them or click Cancel. You will need to restart Eclipse.

[jendave]

invalid LOC header (bad signature)

Sounds like you have a corrupt miglayout jar.

try removing the "C:\Users\jeff\.m2\repository\com\miglayout" directory. Run 'mvn -U clean install' That should redownload it.

[Braids]

invalid LOC header (bad signature)

Sounds like you have a corrupt miglayout jar.

try removing the "C:\Users\jeff\.m2\repository\com\miglayout" directory. Run 'mvn -U clean install' That should redownload it.

REDACTED: that doesn't look like a valid path on a Mac...
i misunderstood to whom dave was writing.

[jendave]

invalid LOC header (bad signature)

Sounds like you have a corrupt miglayout jar.

try removing the "C:\Users\jeff\.m2\repository\com\miglayout" directory. Run 'mvn -U clean install' That should redownload it.

that doesn't look like a valid path on a Mac...

The error is showing up on Jeff's machine not Chris'.

[Chris H.]

To the HowTo contributors. You may want to include a section on actually building Forge using this Maven deal...

`
I started a section dealing with Executing Maven Commands from within Eclipse on at the getting started wiki. It still needs some work but it is a start.

[Braids]

i thought the maven integration was automatic. that's why it takes so long to finish importing a git project.

what am i missing?

[Chris H.]

There was a question on how to do a run or a debug rather than a build. With the Maven connectors we now have this ability in place. Gives people a chance to test their code and script.

The default Maven menu commands cover some situations but not all.

Turns out that using Maven build... with a goal can cover other situations. Granted, some of these would not be used on a everyday basis.

[jeffwadsworth]

invalid LOC header (bad signature)

Sounds like you have a corrupt miglayout jar.

try removing the "C:\Users\jeff\.m2\repository\com\miglayout" directory. Run 'mvn -U clean install' That should redownload it.

Thanks. That fixed it.

[Goblin Hero]

Guys, I can host SVN server on slightlymagic.net if needed. Whose who has access to private forums can discuss it here:
viewtopic.php?f=84&t=5118