LISTSERV mailing list manager LISTSERV 16.5

Help for HPS-SOFTWARE Archives


HPS-SOFTWARE Archives

HPS-SOFTWARE Archives


HPS-SOFTWARE@LISTSERV.SLAC.STANFORD.EDU


View:

Message:

[

First

|

Previous

|

Next

|

Last

]

By Topic:

[

First

|

Previous

|

Next

|

Last

]

By Author:

[

First

|

Previous

|

Next

|

Last

]

Font:

Proportional Font

LISTSERV Archives

LISTSERV Archives

HPS-SOFTWARE Home

HPS-SOFTWARE Home

HPS-SOFTWARE  January 2017

HPS-SOFTWARE January 2017

Subject:

Re: hps-java moving to git

From:

"McCormick, Jeremy I." <[log in to unmask]>

Reply-To:

Software for the Heavy Photon Search Experiment <[log in to unmask]>

Date:

Thu, 19 Jan 2017 20:45:37 +0000

Content-Type:

text/plain

Parts/Attachments:

Parts/Attachments

text/plain (1 lines)

Branching in git is generally much easier to manage than in SVN, and you basically have the following steps:

# checkout the master from within your local copy of the repo (equivalent to trunk in SVN)
git checkout master

# make sure you are sync'd with the remote repo before you branch
git pull

# make a local branch from the master
git checkout -b mybranch

# commit changes to your local branch -- this does not effect the remote repo until you 'git push'
git add some/file; git commit -m "adding some file" some/file

# create a remote copy of the branch to track and push to it
git push -u origin mybranch

Now your local branch tracks the remote branch, called "origin/mybranch" in git terminology, so you can then subsequently 'git push' to it normally.

To checkout the branch locally, e.g. if you wanted to switch between local branches or the master, you would do:

git checkout mybranch

You can also 'git pull' to get changes that others push to the remote branch.

The command 'git stash' can be used to store local, uncommitted changes that would be clobbered by switching to another branch (you can get them back with 'git stash pop').

That's pretty much it.  

Merging back into master from a branch is a separate topic but pretty straighforward (we will generally handle that with pull requests which I'll go over later once the repo is setup).

-----Original Message-----
From: Holly Vance [mailto:[log in to unmask]] 
Sent: Thursday, January 19, 2017 12:20 PM
To: McCormick, Jeremy I.
Cc: hps-software
Subject: Re: hps-java moving to git

Hi Jeremy,

I know we use the svn kit in eclipse for software. Is there something equivalent in git that we can use for eclipse?

Also, will you be updating the software pages in confluence on how to branch, pull, check status, etc? 

-Holly

On Thu, Jan 19, 2017 at 3:15 PM, McCormick, Jeremy I. <[log in to unmask]> wrote:


	Hi,
	
	The decision was made in the software meeting today (by a nearly unanimous vote) to move hps-java from its SLAC-hosted SVN repository to github under the JLAB organization.
	
	I am planning to start this migration early next week.
	
	Once we have imported hps-java into git, probably we should freeze updates to the SVN repository entirely (though there are ways to keep them in sync during the transition period).
	
	Most people developing in hps-java probably already have a github account, but if you do not, then you should sign up for one at http://github.com (it is free).
	
	Then you will want to request to be added to this github organization for write access to the repository, if you do not belong already:
	
	https://github.com/JeffersonLab <https://github.com/JeffersonLab> 
	
	If you have pending local updates to hps-java that are reasonable to commit to the SVN trunk, then I'd encourage you to do that today or tomorrow as probably Monday I am going to push my local git import of hps-java to the JeffersonLab/hps-java git repo.
	
	Please feel free to send any questions/comments you have to the hps-software mailing list.
	
	--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 <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

Top of Message | Previous Page | Permalink

Advanced Options


Options

Log In

Log In

Get Password

Get Password


Search Archives

Search Archives


Subscribe or Unsubscribe

Subscribe or Unsubscribe


Archives

December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
December 2022
November 2022
October 2022
September 2022
August 2022
June 2022
April 2022
March 2022
February 2022
January 2022
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011

ATOM RSS1 RSS2



LISTSERV.SLAC.STANFORD.EDU

Secured by F-Secure Anti-Virus CataList Email List Search Powered by the LISTSERV Email List Manager

Privacy Notice, Security Notice and Terms of Use