Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Pentaho is in the process of migrating all active projects from Subversion to Git hosted on GitHub.com. You can track which projects have been migrated, see their old and new locations at Git Migration List

Tips and tricks

Avoid the issue where you have modified files that you don't want to prevent you from "pull"'ing in new code.

Thanks to Tim Kafalas for this one

Git detects .classpath as local changes and will not allow a "pull" while these changes are present in your working folder. One way to get around this is to stash the local changes, do the pull, then pop the stash. There is another way, however, that will not stress out Eclipse with a re-index.

By default, Git uses a bit in git metadata to determine if a file has changed. This is much more efficient than actually comparing the contents of the file.

The command...

Code Block

git update-index -assume-unchanged {myClassPathFile}

... will reset that bit so that it looks like the file is unchanged. So if you issue this command for each classpath file you should never have to stash them again.

This bit can be changed in Egit by selecting Team -> Advanced -> Assume Unchanged on the file in question.

Note that this setting will "stick" until turned off manually, or until you re-clone the repository. So don't use it on files you have changed but don't want to commit yet, unless you are prepared to manually set the bit afterword.

Get Git

Follow the instructions for your environment here:
http://git-scm.com/

...