On Jul 24, 2012, at 5:06 AM, Gary Kopp wrote: > Denis, > > Thanks for the clarifications. I had read the Versioning and Release > Practices document, but I don't think it fully sunk in. I hadn't seen the > GIT Development draft before, but now that you've pointed me to it I think > it needs some additional work. It doesn't mention "stable-" branches at all. > > Anyway, I'm still slightly confused about bugfix releases. My Git probing > has revealed that the platform stable-4.1.x branch contains commits > post-dating the tag xwiki-platform-4.1.3, as an example taken from one > project (albeit the most important one). Given what you say, this suggests > to me that there will be a 4.1.4 bugfix release, since fixes have been done > on the 4.1.x branch after the release of 4.1.3. Is that true (the roadmap > suggests not)?
Correct. We don't plan roadmaps for bugfix releases, we have roadmaps only for master, i.e. the next coming version. We just release bugfix releases when either we find a blocking bug that, when people ask for it, or when we think there are enough fixes in it that mandate a release. If you wish to see what's already fixed in 4.1.4, see http://bit.ly/LKiAXP > Or is another possibility that these post-4.1.3 fixes will > simply be (or already have been) merged into the master branch for > incorporation into 4.2? It's the other way around. Master is the latest work so we always commit on master and if the bug is important enough and the fix not risky we backport it in the branches so that they have it when doing bugfix releases. I've just added http://dev.xwiki.org/xwiki/bin/view/Community/VersioningAndReleasePractices#HReleasesandSCM which I hope clarifies what's been explained on this thread. Thanks -Vincent > Or am I just missing some other explanation? > > Thanks again for your help. > > --Gary > > -----Original Message----- > From: [email protected] [mailto:[email protected]] On Behalf Of > Denis Gervalle > Sent: Monday, July 23, 2012 6:25 PM > To: XWiki Developers > Subject: Re: [xwiki-devs] Trying to Understand Repositories > > Hi (again) Gary, > > On Thu, Jul 19, 2012 at 6:50 PM, Gary Kopp <[email protected]> wrote: > >> I'm just beginning my exploration of XWiki from a development >> standpoint, and I could use a little help in figuring out the >> structure of the XWiki source repository in terms of release versions. >> I see the use of both branches and tags in the Git repository. At this >> point I guess I really only have two basic questions. >> >> What version of a project such as xwiki-platform is supposed to be in >> the "master" branch? At this point in time, would I be correct in >> assuming that it is the current state of 4.2M1? IOW, master is always >> the current status of the upcoming release? > > > You are fully right. > > >> If I'm wrong about that, how is the code for 4.2[M1] identified in >> Git? Beyond that, does Git contain under-development code beyond the >> next release, and if so how is it identified? > > > Appart from master, it may exist some feature branches, that contains > experimental work. Apart of that, there are also some repositories under the > xwiki-contrib github that contains many contribution, that may or may not go > into our mainstream in the future. > > >> My second basic question concerns identifying code in Git that matches >> a given past (or current) production release. For example, what would >> I checkout to capture the state of the source code as of the public >> release of 4.1.3? I see a branch for "stable-4.1.x" and also a tag for >> "xwiki-platform-4.1.3" (among a surprisingly large number of tags) >> when looking at the xwiki-platform project, and the distinction is not >> clear to me. >> > > According to our support strategy, we apply bug fixing on the latest minor > release while we prepare the next minor release. The stable-4.1.x branch > contains to latest state of the 4.1.x minor release. This branch is released > as bugfix releases until the next minor release is done. > The xwiki-platform-4.1.3 tag is currently the lastest bugfix release of that > branch. We branch the stable branch when the first release candidate release > is done. See > http://dev.xwiki.org/xwiki/bin/view/Community/VersioningAndReleasePractices > for more information about our release process. > > >> I've been through everything I could find in the wiki and didn't find >> anything that answered these questions. TIA. >> > > There is obviously room for improvement on our wiki, in particular about > GitHub, since we moved to GitHub since a while now. There is currently a > valuable draft here: > http://dev.xwiki.org/xwiki/bin/view/Drafts/GitDevelopment > > Hope this helps, and sorry for having been so long to answer ;) > > >> >> --Gary _______________________________________________ devs mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/devs
