[TYPO3-core] Package Builder / Git tags

[Michael Stucki]

Hi Olly,

thanks, that's great!

One thing is now wrong however: The version number was not changed back
to 6.1-dev after the 6.1.0rc1 release.

$ git:(TYPO3_6-1) ✗ grep TYPO3_version
typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php
		define('TYPO3_version', '6.1.0rc1');

It did work after the 6.0.5rc1 however:

$ git:(TYPO3_6-0) grep TYPO3_version
typo3/sysext/core/Classes/Core/SystemEnvironmentBuilder.php
		define('TYPO3_version', '6.0-dev');

I'm wondering, did anyone change since then?

Greetings, Michael

Am 25.04.2013 22:17, schrieb Oliver Hader:
> Hi everybody,
> 
> one short update on this issue: It works now! :)
> 
> The Git tags are now part of the accordant branch and are not detached
> any longer. For example you might wanna look at the recent 6.1.0 RC1
> release and the accordant tag from today:
> 
> https://git.typo3.org/TYPO3v4/Core.git/shortlog/refs/heads/TYPO3_6-1
> 
> Cheers,
> Olly
> 
> 
> Am 06.09.12 17:04, schrieb Michael Stucki:
>> Hi guys,
>>
>> I would like to request a small change in the package builder:
>>
>> Goal: Be able to fast-forward with Git from each tag to the next:
>>
>> ➜  TYPO3core git:(TYPO3_4-6_cs2) git checkout TYPO3_4-7-3
>> Note: checking out 'TYPO3_4-7-3'.
>>
>> You are in 'detached HEAD' state. [rest of this is cut by me]
>>
>> HEAD is now at 87b9678... [RELEASE] Release of TYPO3 4.7.3
>> ➜  TYPO3core
>> ➜  TYPO3core  git merge --ff-only TYPO3_4-7-4
>> fatal: Not possible to fast-forward, aborting.
>>
>>
>> The problem is that the release commits (e.g. 87b9678, see above) are
>> not in line of the release branches (here it's TYPO3_4-7).
>>
>> I believe the fix is simple: Just don't detach from the branch to update
>> ChangeLog and config_default.php and for creating the release tag.
>>
>> If nobody objects, I would like to fix this. For this I need to know:
>>
>> 1. Does anyone think this will have any drawbacks?
>> 2. Where can I find the source for the script?
>>
>> Thanks in advance! :-)
>>
>> - michael
>>
> 
>