[jsword-devel] JSword 2.0 tagged

[DM Smith]

I've tagged JSword v2.0. This is the commit for the av11n work that Martin used for And Bible.

From this point, we'll do bug fixes, tagging them as v2.0.1, v2.0.2, ...

I'm a bit new to git, so I'd like recommendation on how to proceed. Do we want to make a v2.0 release branch and have master be the development toward the next release? Or do we want to do new development on feature branches and have master be the bug fix branch?

Obviously, if we have a release branch, we'll need to put fixes on both the release branch and on master. This will be easy at first, but later divergent changes will cause problems.

I'm inclined to have a release branch staying at Java 5 and have master be Java 6. Until we have a change that should be part of the next release and not be a fix to the current release, we can do the work on master. (I've done just that with Martin's PR). But I can be easily swayed.

Also, I think de-stabilizing changes should be done on feature branches. To me a de-stabilizing change is one that might change in its API or may be broken from one day to the next. Much of av11n work was de-stabilizing. By doing it on master, it compromised the ability to have bug fixes or a release based on such. Chris B has a PR that might be such a feature (versification mapping).

In Him,
	DM
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 4145 bytes
Desc: not available
URL: <http://www.crosswire.org/pipermail/jsword-devel/attachments/20130716/c26350dc/attachment.p7s>