Re: [Gmod-tripal-devel] Committing to the Drupal.org repository

[Stephen F. <spf...@gm...>]

Hi Lacey,

I believe Alex created the 6.x-0.4-dev branch so as not to alter the 
current state of the master branch which has our code as it came from 
the SVN repository.  He's been working with themeing a bit.

So here is my proposal.  I think we should have only a single branch for 
active group development.  Any work we all do as a group gets committed 
to this primary development branch.  Each time we issue a release we 
create a new branch for that release (e.g. Tripal-v6.x-0.4) and put the 
code in there.   But this release branch doesn't get created until we 
are preparing to make the release.  We can then use those release 
branches in the future for making bug fixes and minor releases on those 
versions.

Then, if we do branch for any other reason, it should only be for 
exploratory things, like Drupal 7, etc.  Or if someone individually 
wants to create a branch for some other non-democratically approved 
changes then perhaps those branches should be prefixed with the person's 
Drupal user name.

This way, we only have one active development branch and we maintain 
strict naming for releases.

So, I don't know the differences between the 6.x-0.4-dev branch that 
Alex created and the master branch, other than perhaps the theming work 
that has been done.  Alex is out sick today so we'll have to wait to ask 
him.  If there are no other differences then I suggest we just keep the 
"master" branch as our main development branch.

Stephen


On 12/13/2011 1:47 PM, Lacey-Anne Sanderson wrote:
> I see that a 6.x-0.4-dev branch has been added to the Drupal.org 
> <http://Drupal.org> Tripal repository. I just wanted to clarify the 
> workflow for making changes to Tripal so that we're all on the same page.
>
> *Workflow:*
> 1. Checkout devel branch
> git pull origin
> git checkout 6.x-0.4.dev
> 2. Make changes
> 3. Do testing (currently manual testing)
> 4. Repeat steps 2 & 3 until confident change hasn't broken related 
> parts in Tripal
> 5. Commit changes to devel branch
> git status
> git add .
> git commit -am "<Modulename>: <Change made>"
> -if commit is related to a single module, the commit message should be 
> "Modulename: change made"
>
> At what point should the devel branch be merged with master?
> Also, when we say master what do we mean? ie: should this always be 
> the current release?
>
> I often need the newest features of Tripal on my production site -if 
> people could not commit to devel until they're relatively sure it 
> hasn't broken anything that would allow me to use the devel branch 
> directly.
>
> ~Lacey
>
> ------------------------------------------------------
> *Lacey-Anne Sanderson*
> Bioinformaticist
> Pulse Crop Breeding and Genetics
> Phone: (306) 966-2430
> Email: lac...@sh... <mailto:lac...@sh...>
> Room 3D10 Agriculture
> Department of Plant Sciences
> University of Saskatchewan
>