On Mon, Jun 08, 2015 at 01:58:03PM -0400, Khem Raj wrote: > On Mon, Jun 8, 2015 at 1:24 PM, Martin Jansa <[email protected]> wrote: > > If it's too much to ask, I'll just update b5.4* branches in > > https://github.com/meta-qt5/qtbase myself before applying this patch, > > but basically when I'm upgrading to newer version, I usually want to use > > git to just rebase the patches for newer revision (or completely new > > branch like now when upgrading from 5.4 to 5.5 and having up2data > > patches in qtbase git repository is very useful, when I'm done I just > > git format-patch them to refresh .patch files in meta-qt5. > > > > For new meta-qt5 patches it's simple, I can just use git am to add them > > in meta-qt5/qtbase, for refreshing patches I need to be more careful not > > to forget to do this, before I do next version/revision upgrade. > > essentially, you have created forks of qt repos from upstream. Are you > also syncing them on regular bases ?
Yes, but I sync them only when I want to introduce new revision/version in meta-qt5 or when I'm adding new patch sent to this ML or update of patch (if I don't forget to do it after testing it in jenkins build). > So we never rebase/refresh the patches but do incremental patches > unless you decide to squash them ? I always do rebase, but I don't expect other contributors to do it unless they're sending patch upgrading revisions/versions used in .bb files. Incremental patches are always welcome even for issues like this one, because it's easier for me to "git am" + "git rebase -i" to squash them into correct patch and refresh with git format-patch. > I am fine with this workflow. I have something similar in mind for > other components.It will help us push component > patches upstream as well. I am doing something similar for toolchain > components on my own but in the end generating > patches for public consumption. Yes, it's sometimes a bit annoying churn in .patch files, but having simple git branch with all our changes in good format for pushing them upstream is IMHO worth it. That's why I always prefer rebase over merge, because I want to resolve conflicts once and then have the patch ready for upstreaming. -- Martin 'JaMa' Jansa jabber: [email protected] -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
