 |
 |
Thanks Jeremy, that's an important failsafe (although our tests could be better). Is there a way to sign up for notification when commits to the repository are made? Norman -----Original Message----- From: [log in to unmask] [mailto:[log in to unmask]] On Behalf Of McCormick, Jeremy I. Sent: Tuesday, January 24, 2017 4:14 PM To: hps-software <[log in to unmask]> Subject: RE: hps-java git repo Also, Hudson build is working now with the new git repo... http://srs.slac.stanford.edu/hudson/view/lcsim/job/hps-modules/2512/ It is polling the repo every 15 minutes for changes and will rebuild if it sees any. I'll working on getting the Hudson release working next... -----Original Message----- From: McCormick, Jeremy I. Sent: Tuesday, January 24, 2017 4:13 PM To: hps-software Subject: RE: hps-java git repo By the way, you may get this error message if you to try to push to the repo... error: The requested URL returned error: 403 Forbidden while accessing https://github.com/JeffersonLab/hps-java.git/info/refs This is usually because it is trying to use the "read only" https address from when you cloned the repo. You can fix this by setting your remote to use the SSH protocol e.g. $ cd hps-java; git remote set-url origin ssh:[log in to unmask] Then as long as you have your SSH keys setup properly you should be able to use "git push" normally without extra arguments. Managing your github SSH keys is covered here: https://help.github.com/articles/connecting-to-github-with-ssh/ If you don't have the SSH keys setup, then likely you would need to push using this syntax instead: $ git push [log in to unmask]:jeffersonlab/hps-java.git Hope it helps! --Jeremy -----Original Message----- From: McCormick, Jeremy I. Sent: Tuesday, January 24, 2017 3:48 PM To: hps-software Subject: RE: hps-java git repo To be clear, anyone using hps-java SVN should instead switch to the git repo immediately. No more changes should be made to the hps-java trunk. For now, direct push to the master is allowed (it will be disabled later with a project setting). If you have any questions or don't know how to use git etc., please let me know and I can help. -----Original Message----- From: Graf, Norman A. Sent: Tuesday, January 24, 2017 11:53 AM To: McCormick, Jeremy I.; hps-software Subject: RE: hps-java git repo Thanks Jeremy, Before "push"ing modifications back to the central repository I would recommend a "git pull" (rough equivalent of "svn update") to integrate any other changes that may have been committed by others. Norman -----Original Message----- From: [log in to unmask] [mailto:[log in to unmask]] On Behalf Of McCormick, Jeremy I. Sent: Tuesday, January 24, 2017 11:31 AM To: hps-software <[log in to unmask]> Subject: hps-java git repo Hi, I have transferred the hps-java git repo from my personal account to its permanent home under the JeffersonLab organization on github. https://github.com/JeffersonLab/hps-java Anyone in JeffersonLab within the HPS team should have access. Development using the SVN copy of hps-java should probably cease, and we should move to using this (though there are some commands we can use to pull updates from the SVN if needed). You can clone the repository using: $ git clone https://github.com/JeffersonLab/hps-java.git Add new or modified files to a checkin: $ git add someNewFile someOldFile Checkin your work to the local staging area: $ git commit -m "adding some new file" someNewFile Finally, you can push to the master: $ git push In general, within git it is best to do your work on a branch, not directly on the master. To create a branch: git checkout -b jeremym-dev After add and checkin of files to your branch, you can merge locally from your branch into master: git checkout master; git merge jeremym-dev Eventually, all non-trivial work on this repo should be tracked in the github issue tracker and be assigned a proper branch. Merging should occur with pull requests (more on this later). Let me know if you have any questions. --Jeremy ######################################################################## Use REPLY-ALL to reply to list To unsubscribe from the HPS-SOFTWARE list, click the following link: https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=HPS-SOFTWARE&A=1 ######################################################################## Use REPLY-ALL to reply to list To unsubscribe from the HPS-SOFTWARE list, click the following link: https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=HPS-SOFTWARE&A=1 ######################################################################## Use REPLY-ALL to reply to list To unsubscribe from the HPS-SOFTWARE list, click the following link: https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=HPS-SOFTWARE&A=1