On Saturday 29 December 2012 13:47:48 Christophe Giboudeaux wrote: > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > http://git.reviewboard.kde.org/r/108002/ > ----------------------------------------------------------- > > Review request for Build System, kdelibs and Alexander Neundorf. > > > Description > ------- > > This patch replaces all the macro_log_feature entries with feature_summary.
Hi Christophe, This creates a nice set of conflicts in frameworks. # Unmerged paths: # (use "git add/rm <file>..." as appropriate to mark resolution) # # both modified: CMakeLists.txt # both modified: dnssd/CMakeLists.txt # both modified: kdecore/CMakeLists.txt # deleted by us: kdecore/compression/ConfigureChecks.cmake # both modified: kimgio/CMakeLists.txt # both modified: kioslave/http/CMakeLists.txt # both modified: kioslave/http/http.cpp # both modified: mimetypes/CMakeLists.txt # both modified: tier1/itemmodels/autotests/proxymodeltestsuite/CMakeLists.txt # both modified: tier1/kjs/src/kjs/CMakeLists.txt # both modified: tier1/solid/src/solid/CMakeLists.txt # both modified: tier2/kauth/src/ConfigureChecks.cmake Can you do "git merge origin/master" in a frameworks checkout and fix the conflicts? The http.cpp conflict is unrelated, you can just remove the code inside <<< ===. -- David Faure, [email protected], http://www.davidfaure.fr Working on KDE, in particular KDE Frameworks 5 _______________________________________________ Kde-buildsystem mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-buildsystem
