On 24 May 2017 at 00:52, Alexandru Croitor <[email protected]> wrote: > Hi all, > > The merging of the pyside-setup, shiboken and pyside2 repos is imminent. > The old repos will stay around for some time, and eventually get deleted, and > the repository that should be used from now on is pyside-setup. > > The examples, tools, and wiki submodules will remain as usual. > > The good side of things is that shiboken / pyside / pyside-setup changes can > happen in single atomic commits. > All git history is saved. > And management of the CI side of things should be much simpler now.
Sounds great! Congrats! Chris > > There are a few downsides: > - there are going to be a couple bogus merge commits for the actual repo > merging, which will have a non-buildable state. > > - git bisect will not work properly for commits before the repo merge, > because checking out a previous revision of a submodule will only contain the > sources of that submodule, and not of the whole super tree. If you want to do > a build of previous commits, you will have to jump through some hoops, mainly > manually replicating the 3 previous submodule file structures, either by git > cloning 3 times, or setting up self-referential submodules with different > SHA1s. > > - builds of previous commits won't work unless you do the steps outlined > above. > > - all existing un-merged gerrit changes will have to be rebased. The best way > I see for this is using git-format-patch, modifying the files paths in the > generated patches, and applying them in the new repo. > > - maybe something else which I'm currently not seeing. > > Regards, > Alex. > > > --- > Alexandru Croitor > Software Engineer > > The Qt Company GmbH > Rudower Chaussee 13 > D-12489 Berlin > [email protected] > http://qt.io > > Geschäftsführer: Mika Pälsi, > Juha Varelius, Mika Harjuaho > Sitz der Gesellschaft: Berlin, > Registergericht: Amtsgericht > Charlottenburg, HRB 144331 B > --- > _______________________________________________ > PySide mailing list > [email protected] > http://lists.qt-project.org/mailman/listinfo/pyside _______________________________________________ PySide mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/pyside
