[jsr362-observers:] [jsr362-experts:] Re: Meeting Minutes & misc topics
- From: Neil Griffin <
- Subject: [jsr362-observers:] [jsr362-experts:] Re: Meeting Minutes & misc topics
- Date: Mon, 12 Aug 2013 15:26:32 -0400
- List-id: <jsr362-experts.portletspec3.java.net>
Since Git branches are convenient for prototyping, it's easy to end up with
many branches. One scheme that seems to work well is to create branches with
the issue number at the beginning of the branch name. For example:
On Aug 7, 2013, at 12:09 PM, Martin Scott Nicklous
> The meeting minutes from yesterday's call are up. See:
> I pushed two branches to the portletspec3 repository today: PortletState
> and newCreateURLs. We now have five branches:
> master - main branch containing agreed-upon updates. The
> from this branch are placed on the github.io site linked by the
> porteltspec3 project readme.
> ErrataChanges - Working branch that I have been using to add the
> changes. Contains no new info (as of today) as compared to master
> PortletState - Prototype API changes for the PORTLETSPEC3-11 proposals #1,
> #2, and #4. Proposal #4 is new, and is available from the head of this
> PortletState#3 - Prototype API changes for the PORTLETSPEC3-11
> proposals #3.
> newCreateURLs - Prototype API changes for PORTLETSPEC3-30 (the
> createActionURL & createRenderURL methods with a flag for copying
> There are also tags available that designate specific versions of the
> I can see where this can get confusing quickly, so we may need a naming
> scheme and/or use discipline to avoid creating many branches ...
> I am a bit hesitant to provide any kind of instructions for getting the
> stuff and looking at it, because, although I am getting better, I am not a
> git expert yet, and I don't want to lead anybody astray.
> But the basic idea, assuming you already have cloned the portletspec3
> repository, is as follows (adapt to your own setup ..):
> retrieve the updates to your remote tracking branches:
> git fetch upstream
> git fetch --tags upstream
> Update the individual local branch you want to look at:
> git checkout PortletState (note that if you
> have this branch yet, you DO NOT want to create it before doing the
> checkout - you'll get a completely different effect, depending on where you
> create the branch).
> git merge upstream/PortletState
> Build with maven:
> cd portlet-api_3.0 (I'll have to add a pom.xml in the root as
> parent sometime)
> mvn clean
> mvn install
> mvn javadoc:javadoc
> And view the apidocs located at:
> I hope that provides enough hints to get started, without causing anyone to
> trash their repository ...