[TYPO3-v4] Core projects merge via subtree merge?

[Ernesto Baschny [cron IT]]

Dmitry Dulepov schrieb am 07.03.2011 10:05:
> Hi!
> 
> Tolleiv.Nietsch wrote:
>> Karsten pointed me to "subtree merge" as possible strategy to merge the
>> Core projects (in my case workspaces) to the Core. A documentation for
>> that can be found in [1].
> 
> Workspaces is a separate project, right?
> 
> Why don't you simply merge the result into a separate branch and push
> the merged result into the core? This will be a simple commit if I am
> not mistaken.

That's exactly what the "subtree merge" of GIT does for you! Its about
the confort of using git for the merge (instead of manually doing it
with "patch files").

I agree that the workflow Tolleiv describes sounds very good.

But if the end result contains all commits from the original project, it
could become a nightmare to get that "though gerrit".

On the other hand, it might as well be a "good thing" that we have all
individual fixes getting into our main "change log", as it is then
easier to track the source of a introduced bug (as opposed to if you
squash all commits into one before the push).

So maybe we should do it for bug fixes (older branches) and only squash
commits into one if there was really a huge new feature being
implemented which has to "enter the core" (in which case one huge
squashed commit should be fine).

What do you think?

Cheers,
Ernesto