[Development] Merging qtquickcontrols2 into qtdeclarative

[Mitch Curtis]

Thanks Tor Arne. Can you elaborate a bit on the commands used for a prefixed subtree merge? Or point to a page that explains it?

From: Tor Arne Vestbø <Tor.arne.Vestbo at qt.io>
Sent: Monday, 12 July 2021 4:17 PM
To: Mitch Curtis <mitch.curtis at qt.io>
Cc: development at qt-project.org
Subject: Re: [Development] Merging qtquickcontrols2 into qtdeclarative

One way to do this is with a prefixed subtree merge without squashing the history of controls2.

What ossi (?) referred to was using git replace to inject the history of controls, but I’m not sure how that would look so perhaps he can outline that approach.

Cheers,
Tor Arne


On 12 Jul 2021, at 14:42, Mitch Curtis <mitch.curtis at qt.io<mailto:mitch.curtis at qt.io>> wrote:

Hi.

The consensus from the contributor's summit session regarding https://bugreports.qt.io/browse/QTBUG-79454 was that qtquickcontrols2 should be merged into qtdeclarative:

https://wiki.qt.io/QtCS2021_-_Testing_upstream_changes_with_downstream_modules#Move_specific_modules_into_the_repository_of_the_module_they_depend_on

In terms of Git, what is the best way to proceed with this? Which commands should be used? Any specific things to be aware of? For example, one note made during the session was:

“Graft history in, don't merge it.”

Cheers.
_______________________________________________
Development mailing list
Development at qt-project.org<mailto:Development at qt-project.org>
https://lists.qt-project.org/listinfo/development

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.qt-project.org/pipermail/development/attachments/20210712/fcf54319/attachment.html>