[Qt-interest] The 4.7-stable branch

[Thiago Macieira]

Em Quarta-feira 10 Novembro 2010, às 10:38:43, Kai Koehne escreveu:
> On 11/10/2010 10:23 AM, ext James Larcombe wrote:
> > Hello,
> > 
> > We use the 4.7-stable branch as our baseline Qt source tree.
> > 
> > I updated yesterday expecting to find all the 4.7.1 changes, but unless
> > I'm mistaken I don't think they're all there - for example the commit at
> > the 4.7.1 tag itself
> > (http://qt.gitorious.org/qt/qt/commit/1b3f43c997b00d6b0d435ed8be08596c91
> > 3a0189) isn't in that branch.
> > 
> > Is this expected? Is there a delay, or should I not be using the
> > 4.7-stable branch any more?
> 
> Hi James,
> 
> I don't know the difference between 4.7 branch and 4.7-stable branch
> these days. But you're right that this particular change was
> 'cherry-picked' into 4.7.1 before making it through the CI system, and
> therefore before it became part of 4.7 / 4.7-stable. It should have been
> integrated by now, though.

The difference is the testing level. Nothing has changed since we first 
announced these branches.

So it's like this, in order of stability:

- v4.7.1 (tag)
	contains the actual released code
- 4.7.1 (branch in the qt-releases repository)
	contains the code that is going to be released
	therefore, you never see the tag and the branch at the same time
	this branch is controlled manually by Release Management and contains
	a lot of manual checks. Its lifetime is usually between 8-12 weeks.
- 4.7-stable (branch)
	contains the code that has passed the compilation and testing steps in 
	all platforms, including the slow ones. This is known to contain no unit 
	test regressions on the main platforms, plus it is known to compile in 
	all Tier 1 and 2 platforms
- 4.7 (branch)
	contains the code that has passed the compilation and testing only on the
	fast platforms. It doesn't contain unit test regressions on Mac, Windows 
	and Linux, and it compiles on a couple of other platforms.
- master-stable and master
	same as the two above, but for Qt 4.8 and not feature-frozen
- staging areas (repository)
	contains code that hasn't passed any tests yet

In the same order as above, the branches are merged one into the order with 
the exception of the *-stable branches. So the v4.7.1 tag is merged into 4.7, 
4.7 is merged into master, the 4.7 and master branches are merged into the 
staging areas.

As for your change, it contains the following message:
    (cherry picked from commit b2016bbfc9c7389e7b64451417395ceba96af21f)

And:
$ git br -r --contains b2016bbfc9c7389e7b64451417395ceba96af21f
  origin/4.7
  staging/4.7

-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
  Senior Product Manager - Nokia, Qt Development Frameworks
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
Url : http://lists.qt-project.org/pipermail/qt-interest-old/attachments/20101110/ed6f477d/attachment.bin