[TYPO3-core] [RFC] Upcoming Git changes
Ernesto Baschny [cron IT]
ernst at cron-it.de
Wed May 15 11:53:55 CEST 2013
I agree with all of that and it looks pretty good!
What is still missing is an important part: What *would* be the new name
of our repository?
There is a very confusing and not concluding brainstorming document here:
We have thought that the TYPO3v4's new name in GIT could be:
But then lots of questions arose: Couldn't it be "Distributions"? What
about CMS-Extensions? Are they also Packages? etc etc..
This "thingy" has to be decided first, and requires some interaction
with the Flow/Neos team, because their current names aren't consistent
too (i.e. FLOW3/Packages/TYPO3.FLOW3.git). Also we should not forget
that we want to include the "upstream fluid" directly in TYPO3 CMS at
some point, which is currently FLOW3/Packages/TYPO3.Fluid.git.
Complex topic.. It should be finished in a small team which knows the v4
and the Flow side of the requirements and has some foresight.
Michael Stucki schrieb am 15.05.2013 10:57:
> Hi folks,
> with the new roles and groups in place, we no longer need to have Git
> submodules for various extensions.
> Since a few days we have been discussing how to practically get rid of
> the submodules in a small working group.
> Because of this huge change, the idea was brought up to do rewrite the
> Git history in a sense that the submodules would never have existed.
> Amazing enough, such thing would be possible with Git :-)
> Together with this change, other pending issues could be addressed as well:
> 1. Fix the namespace change
> This implies a rewrite of the Git history of commits in master and
> currently maintained branches since approx. October 2012. The benefit
> would be an improved working of Git blame.
> 2. Merge submodules into the main repository
> Perform a massive rewrite of the history by fully erasing the usage of
> submodules from history and replace them by appropriate file trees (real
> file blobs).
> 3. Rename the repository
> There is nothing special involved in this change. It is just an effect
> of the rebranding and can be done simultaneous with 1) and 2)
> Yesterday, we discussed these points again in the server team meeting:
> We see a lot of problems coming if Git history will be rewritten.
> Therefore we recommend to avoid it, and do the following instead:
> * Fix the namespaces change with a nice workaround (Peter brought this
> up but it's available since long):
> $ git fetch origin "refs/heads/sandbox/tmaroschik/replace/*:refs/replace/*"
> This command needs to be run only once and would make "git annotate"
> work beyond the namespaces change. Tutorials should be upgraded to
> include this command during the setup.
> * Prepare the history of submodules in a branch which also has the
> namespace problems fixed. Afterwards, merge this branch. (Thomas
> Maroschik is already working on this.)
> * Renaming of the repository:
> a) Just delete the remote & add a new one
> b) $ git remote set-url origin "<new-url>"
> If we do it like this we have a complex history where submodules are
> switched on and off, which is not always easy to manage. However, as a
> benefit, we keep all SHA's and don't need a single history rewrite.
> This is our current suggestion! We hope you agree with it, and that we
> can practically solve all problems with these planned changes.
> Greetings, Michael
More information about the TYPO3-team-core