JiscMail Logo
Email discussion lists for the UK Education and Research communities

Help for MOONSHOT-COMMUNITY Archives


MOONSHOT-COMMUNITY Archives

MOONSHOT-COMMUNITY Archives


MOONSHOT-COMMUNITY@JISCMAIL.AC.UK


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

MOONSHOT-COMMUNITY Home

MOONSHOT-COMMUNITY Home

MOONSHOT-COMMUNITY  March 2011

MOONSHOT-COMMUNITY March 2011

Options

Subscribe or Unsubscribe

Subscribe or Unsubscribe

Log In

Log In

Get Password

Get Password

Subject:

Branches to use

From:

Sam Hartman <[log in to unmask]>

Reply-To:

Moonshot community list <[log in to unmask]>, Sam Hartman <[log in to unmask]>

Date:

Tue, 15 Mar 2011 06:04:08 -0400

Content-Type:

text/plain

Parts/Attachments:

Parts/Attachments

text/plain (61 lines)

Scott, thanks again for letting us know  that master was not working.
That's been fixed.

In order to help developers understand what branch they should be using
here's a description of active branches in Moonshot.

== Switching Branches ==

As with any Git project, you use the 'git checkout' command to switch
branches. This might look like:

    git checkout -b master origin/master #create local copy of master
    git checkout origin/feature # check out with no plan to commit

However, Moonshot also has a number of submodules. These include
libradsec, Shibboleth, and libeap.
Each commit to the main Moonshot repository includes a reference to the
appropriate commit of a sub project to use. This is a *commit*, not a
*branch*. That is, a Moonshot developer needs to make a explicit
decision to update what version of a subproject is being used on a given
moonshot branch.

However, git does not automatically adjust the version of subprojects
you have checked out. After updating, either by pulling, checking out a new branch, merging or
rebasing, it is a good idea to run 'git submodule update'. This command
will set every subproject to the expected commit stored in the Moonshot
branch you have checked out. See [[submodules]] for information on what
to do if you need to work with one of these subprojects.

== Master ==

The master branch is intended to be stable but active. Code on the
master branch is expected to build and work; if it does not, please
notify the mailing list. However, the master branch is also the target
of frequent integrations. When code is mature enough that it should
generally be used by other Moonshot developers, it should be merged to
master.

At least until we have stable releases, new users should be directed to
master.

== meeting/moonshot2 ==

This is a [[integration branch]] for the second moonshot meeting. As the
meeting approaches it is desirable to slow down the pace of change in
code that participants will be using. It would be unfortunate to get
into a situation where a change breaking master disrupted the
meeting. This branch is managed by Sam Hartman; ask before committing to
this branch.

Participants at the second moonshot meeting are likely to find a build
of this branch helpful.
However during the meeting we will likely update this branch or
sometimes work from master once we get basic functionality working.

== tlv-mil ==

This branch is a [[feature branch]] under development. The intent is to
add a cryptographic checksum to Moonshot exchanges as part of
extensibility.

Top of Message | Previous Page | Permalink

JiscMail Tools


RSS Feeds and Sharing


Advanced Options


Archives

April 2024
March 2022
December 2021
October 2021
September 2021
August 2021
June 2021
April 2021
February 2021
January 2021
December 2020
November 2020
October 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
January 2020
November 2019
October 2019
September 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
December 2018
June 2018
April 2018
November 2017
October 2017
September 2017
August 2017
July 2017
May 2017
April 2017
March 2017
February 2017
November 2016
October 2016
August 2016
July 2016
June 2016
May 2016
March 2016
February 2016
January 2016
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
February 2011
January 2011
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010


JiscMail is a Jisc service.

View our service policies at https://www.jiscmail.ac.uk/policyandsecurity/ and Jisc's privacy policy at https://www.jisc.ac.uk/website/privacy-notice

For help and support help@jisc.ac.uk

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