Notice: This Wiki is now read only and edits are no longer possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Difference between revisions of "Henshin/Committer Instructions"
< Henshin
(Created page) |
(→Set-up) |
||
Line 2: | Line 2: | ||
== Set-up == | == Set-up == | ||
− | This is what you need to do for the | + | This is what you need to do for the set-up: |
# If you don't have one yet, generate a SSH RSA key pair: do ''ssh-keygen -t rsa'' in the git shell. | # If you don't have one yet, generate a SSH RSA key pair: do ''ssh-keygen -t rsa'' in the git shell. | ||
Line 10: | Line 10: | ||
#* To change the local e-mail address, do ''git config --global user.email [your email address here]'' | #* To change the local e-mail address, do ''git config --global user.email [your email address here]'' | ||
#* In the same manner, you can view and change your committer name using the ''user.name'' environment variable. | #* In the same manner, you can view and change your committer name using the ''user.name'' environment variable. | ||
+ | # To ensure correct handling of line endings when using Windows, please use the following git configs: ''core.autocrlf=true'' and ''core.filemode=false''. If you have dirty projects due to windows line endings, try a hard reset after setting the config. | ||
# Clone the Henshin repo (in Eclipse) from ssh://committer_id@git.eclipse.org:29418/henshin/org.eclipse.emft.henshin (restarting Eclipse before this step may be required. It is also possible via https, but with a separate [https://git.eclipse.org/r/#/settings/http-password HTTP pw]) | # Clone the Henshin repo (in Eclipse) from ssh://committer_id@git.eclipse.org:29418/henshin/org.eclipse.emft.henshin (restarting Eclipse before this step may be required. It is also possible via https, but with a separate [https://git.eclipse.org/r/#/settings/http-password HTTP pw]) | ||
# In the Git perspective, open the Repository: ''Remotes -> origin -> Gerrit Configuration... -> Finish''. Check out the plug-ins you want to work on. | # In the Git perspective, open the Repository: ''Remotes -> origin -> Gerrit Configuration... -> Finish''. Check out the plug-ins you want to work on. | ||
− | + | #*In case of build errors for the plug-in ''org.eclipse.emf.henshin.cpa'', please follow the [http://git.eclipse.org/c/henshin/org.eclipse.emft.henshin.git/tree/plugins/org.eclipse.emf.henshin.cpa/README-obtain_AGG_plugin.txt instructions] to reconcile the dependency to AGG. | |
− | In case of build errors for the plug-in ''org.eclipse.emf.henshin.cpa'', please follow the [http://git.eclipse.org/c/henshin/org.eclipse.emft.henshin.git/tree/plugins/org.eclipse.emf.henshin.cpa/README-obtain_AGG_plugin.txt instructions] to reconcile the dependency to AGG. | + | |
== Pushing changes == | == Pushing changes == |
Revision as of 04:27, 19 September 2016
Henshin uses Gerrit for handling code reviewing and merging. This implies specific processes when setting up the development environment and pushing changes.
Set-up
This is what you need to do for the set-up:
- If you don't have one yet, generate a SSH RSA key pair: do ssh-keygen -t rsa in the git shell.
- Register your public key at https://git.eclipse.org/r/#/settings/ssh-keys
- Make sure your git's local committer e-mail address matches the one registered at https://git.eclipse.org/r/#/settings/contact
- To view the local e-mail address, do git config user.email. An empty result means the e-mail address has not been set yet.
- To change the local e-mail address, do git config --global user.email [your email address here]
- In the same manner, you can view and change your committer name using the user.name environment variable.
- To ensure correct handling of line endings when using Windows, please use the following git configs: core.autocrlf=true and core.filemode=false. If you have dirty projects due to windows line endings, try a hard reset after setting the config.
- Clone the Henshin repo (in Eclipse) from ssh://committer_id@git.eclipse.org:29418/henshin/org.eclipse.emft.henshin (restarting Eclipse before this step may be required. It is also possible via https, but with a separate HTTP pw)
- In the Git perspective, open the Repository: Remotes -> origin -> Gerrit Configuration... -> Finish. Check out the plug-ins you want to work on.
- In case of build errors for the plug-in org.eclipse.emf.henshin.cpa, please follow the instructions to reconcile the dependency to AGG.
Pushing changes
After pushing a change, a corresponding entry on Gerrit has been created. Please invite (a subset of) the other committers as reviewers, doing this for all changes.