[TYPO3-v4] Working with submodules

Oliver Hader oliver.hader at typo3.org
Tue May 10 13:51:29 CEST 2011


FYI: The modifications that have been directly submitted to the Core in
typo3/sysext/version and typo3/sysext/workspaces now have been reapplied
to master an TYPO3_4-5.

Unfortunately is blocking me to submit the raised submodule pointer also
to TYPO3_4-5. I hope this will be solved this afternoon.

Cheers,
Olly


Am 10.05.11 12:24, schrieb Oliver Hader:
> Hi again,
> 
> Am 10.05.11 12:17, schrieb Oliver Hader:
>> Am 10.05.11 12:12, schrieb Oliver Hader:
>>> Hi Stefano,
>>>
>>> Am 09.05.11 19:24, schrieb Stefano Kowalke:
>>>> Today git submodules was introduced in core for the external projects
>>>> "version" and "workspaces".
>>>>
>>>> 1)
>>>> Unfortunable the revisions of where the submodules created from were not
>>>> up-to-date. As result fixed issues popped up again. I noticed this on
>>>> fixed CGL issues, so it is possible that all issues realted to verion
>>>> and workspaces since mid of april are back again.
>>>
>>> The CGL cleanup have been committed to the Core directly for
>>> typo3/sysext/version and ~/workspaces. However I remember that I also
>>> gave a positive vote on that change and did not realize that conflict.
>>> For example this is something the submodule would solve - to take care
>>> of the correct repository of external projects.
>>
>> I'm going to check the changes that have been committed directly to
>> version and workspaces systexts.
> 
> We have the following scenario:
> 
> *master, typo3/sysext/version/*
> 
> b1da97bd3f105c0e00eab2cd071fc4e483c8a922 [TASK] Use external Core
> Projects workspaces and version as Git submodules
> 218a48ef59c671e3b27e74e88c52c4737f280062 [TASK] Each PHP statement must
> be on a line by itself
> 50cbf2640caad79144d3d9c2d511030a78c7cc9c [TASK] Change "false" into "FALSE"
> 3a45abf03fa0a09488437c57cb883bba857e2f4a [TASK] Change "null" into "NULL"
> f8b8898e2ec321225663a2bdf9338b5e7c4632b5 [TASK] Change "true" into "TRUE"
> 81746f39d4c0d09b3f8a1d67fac6514520592a44 [TASK] TYPO3 code must not use
> the else if construct
> ca0373e4027f13baf66c1d953664a2ce6c453c67 [TASK] Remove trailing newlines
> from EOF
> 59900b6682cc043d7541b3e26380cb3dd843d14b [TASK] Remove SVN auto
> properties $Id$
> 
> *master, typo3/sysext/workspaces/*
> 
> b1da97bd3f105c0e00eab2cd071fc4e483c8a922 [TASK] Use external Core
> Projects workspaces and version as Git submodules
> 50cbf2640caad79144d3d9c2d511030a78c7cc9c [TASK] Change "false" into "FALSE"
> 3a45abf03fa0a09488437c57cb883bba857e2f4a [TASK] Change "null" into "NULL"
> f8b8898e2ec321225663a2bdf9338b5e7c4632b5 [TASK] Change "true" into "TRUE"
> 81746f39d4c0d09b3f8a1d67fac6514520592a44 [TASK] TYPO3 code must not use
> the else if construct
> ca0373e4027f13baf66c1d953664a2ce6c453c67 [TASK] Remove trailing newlines
> from EOF
> 434eb7524a0433ecee56d60f5f312ae4d9b4b88e [TASK] PHP closing tag don't
> exist in some files
> 59900b6682cc043d7541b3e26380cb3dd843d14b [TASK] Remove SVN auto
> properties $Id$
> 
> *TYPO3_4-5, typo3/sysext/version/*
> 
> nothing was changed directly
> 
> *TYPO3_4-5, typo3/sysext/workspaces/*
> 
> eb3b9cde1e55b29e99b46a6d09fb07113c8a760f [TASK] Use external Core
> Projects workspaces and version as Git submodules
> 5573182f6705afe645307fd8395ca7ed1b72d1ed [TASK] PHP closing tag don't
> exist in some files
> 
> Cheers,
> Olly


-- 
Oliver Hader
TYPO3 v4 Core Team Leader

TYPO3 .... inspiring people to share!
Get involved: http://typo3.org


More information about the TYPO3-project-v4 mailing list