[Development] Merging qtquickcontrols2 into qtdeclarative

Tor Arne Vestbø Tor.arne.Vestbo at qt.io
Mon Jul 12 17:18:38 CEST 2021

On 12 Jul 2021, at 17:03, Oswald Buddenhagen <oswald.buddenhagen at gmx.de<mailto:oswald.buddenhagen at gmx.de>> wrote:

On Mon, Jul 12, 2021 at 02:17:01PM +0000, Tor Arne Vestbø wrote:
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.

it would be actually also just a subtree merge, but of a re-import, to which the old history would be grafted (that is, git-replaced when using up-to-date git mechanisms).
that would avoid duplicating the history, which would make the repo somewhat smaller and leave us with only one authoritative copy of said history (the original module will have to stay around for quite a while and keep receiving fixes anyway).

Ah, right, so a subtree merge of a “Import controls2” squashed commit that is then grafted to point to the old repo’s history if needed for log/bisects (or something along those line).

Can you help out with the concrete git steps that are needed for that since you have the flow mapped out better than me and Mitch?


Tor Arne

Development mailing list
Development at qt-project.org<mailto:Development at qt-project.org>

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

More information about the Development mailing list