kde-qt branches after 4.6.0 release

[Thomas Lübking]

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:
   QTDIR="`pwd`" bin/syncqt
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" ;-)

Cheers

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
>  worlds.
> 
> I have:
> 1) deleted branches:
> 	patches/0274-shm-native-image-fix
> 	patches/0255-qtreeview-selection-columns-hidden
> 	patches/0280-deserialization-custom-dbus-properties
> 	patches/0286-fix-error-string
> 	patches/0288-more-x-keycodes
> 	patches/287-qmenu-respect-minwidth
> because they were no longer relevant. They have all been applied to Qt
>  4.6.0 already.
> 
> 2) rebased the remaining branches:
> 	patches/0180-window-role
> 	patches/0195-compositing-properties
> 	patches/0209-prevent-qt-mixing
> 	patches/0216-allow-isystem-for-headers
> 	patches/0225-invalidate-tabbar-geometry-on-refresh
> 	patches/0250-out_of_source_build
> 	patches/0253-qmake_correct_path_separators
> 	patches/0289-context-for-shortcuts-tr
> 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:
> 
> 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:
> 
> 0001-Import-README.qt-copy-from-the-original-qt-copy.patch
> 0002-Update-this-file-to-reflect-the-workflow-with-Git-as.patch
> 0003-This-patch-makes-override-redirect-windows-popup-men.patch
> 0004-This-patch-uses-object-name-as-a-fallback-for-window.patch
> 0005-This-patch-changes-QObjectPrivateVersion-thus-preven.patch
> 0006-This-patch-adds-support-for-using-isystem-to-allow-p.patch
> 0007-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
> 0008-When-using-qmake-outside-qt-src-tree-it-sometimes-ge.patch
> 0009-Add-context-to-tr-calls-in-QShortcut.patch
> 0010-Fix-configure.exe-to-do-an-out-of-source-build-on-wi.patch
> 
> 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
> http://qt.gitorious.org/+kde-developers/qt/kde-qt/blobs/README/README.kde-q
> t
> 
> 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
> v4.6.0-11-g735a877
> $ git describe master
> v4.6.0-47-g7844776
> $ git describe 4.6-stable-patched
> v4.6.0-beta1-985-g87b9139
>