Re: [Jamwiki-devel] git workflow and commit messages

[Ryan H. <rya...@gm...>]

Hi Thomas,

In the past the process for release branches was to commit release code 
directly to the branch and then merge that branch back to master.  In 
some cases changes were backported from master, but in general I've 
found that it's safer to commit the fix to the release branch and then 
merge.  This is the process I've used at a number of jobs, and many open 
source projects use it as well, so it should be fairly robust.  I 
haven't yet merged the latest 1.3.x changes to master, but aside from 
the category initialization fix most of them were just updating the 
version number to 1.3.2, something that will be irrelevant for a branch 
destined to become 2.0.0.

And yes, I can switch to single line commit messages - the current 
format is a holdover from the Subversion days where the format was "area 
of commit" followed by a bullet list of changes.

Updating progress on my own development work, I've been working on 
updates to the database code to simplify connection and transaction 
management by using the Spring JdbcTemplate and TransactionTemplate 
classes, and will hopefully have that code ready for review soon.  The 
database code has always been a somewhat of a mess, so hopefully these 
changes will simplify things and fix some transaction issues in the process.

Ryan