kde-qt branches after 4.6.0 release
thomas.luebking at web.de
Tue Dec 1 19:38:08 GMT 2009
Thanks alot, stupid question:
Does git allow to show custom messages after a pull/checkout, like
"You just updated a developer version of Qt 4.6 blablabla,
next you have to run:
to create necessary private headers, or COMPILATION MIGHT FAIL.
Have a nice day."
In order to avoid trouble for ppl. who had not read that "somewhere" ;-)
Am Tuesday 01 December 2009 schrieb Thiago Macieira:
> Em Terça-feira 01 Dezembro 2009, às 18:05:57, Thiago Macieira escreveu:
> > However, I think I found a good idea in Johannes Sixt's email, after
> > rereading:
> > http://lists.kde.org/?l=kde-core-devel&m=125593609012314&w=2
> > > You could create a branch latest-stable that merges 4.6-stable etc.
> > > such that the merge always takes the content of the merged-in branch.
> > > Then people need just track lastest-stable, and they will be
> > > fast-forwarded by the next git pull.
> Ok, I did was Johannes proposed. I think now we have the best of both
> I have:
> 1) deleted branches:
> because they were no longer relevant. They have all been applied to Qt
> 4.6.0 already.
> 2) rebased the remaining branches:
> They are all now exactly 1 commit on top of Qt 4.6.0's tag (except for one
> branch, which consists of one commit by Luboš and 1 by Benjamin Reed).
> 3) created a new branch called 4.6.0-patched and merged all 8 branches
> above, plus the README branch
> 4) merged 4.6.0-patched to master, so that now master ⊃ 4.6.0-patched
> 5) updated the README to match the new model for creating patches
> (yes, I updated it after merging, so it's not going to be in your
> checkout, but it is on the web)
> Packagers can go back to extracting the commits like this:
> git format-patch v4.6.0..4.6.0-patched
> Which currently produces the following files:
> KDE DEVELOPERS:
> You should use the "master" branch. That branch will contain the latest
> version of Qt that is recommended for KDE usage, plus the patches. (Note my
> choice of wording not recommending the patches)
> If you need to create a patch for kde-qt, please follow the instructions at
> If you do not follow those instructions, you can be certain your change
> will be lost when I upgrade master to Qt 4.6.1.
> Current branch tips are:
> $ git describe 4.6.0-patched
> $ git describe master
> $ git describe 4.6-stable-patched
More information about the kde-core-devel