Initial merge (was: Re: Merge or Cherry-Pick?)

Am 2/3/2011 13:04, schrieb Johannes Sixt: > Before anybody begins to work in this way, someone with sufficient > knowlege must introduce the first real merge of the 4.6 branch into the > master branch. The conflicts must be resolved; or it is possible to punt > by using -s ours. > > As long as thi

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

On Thursday, 3 de February de 2011 22:44:56 Dawit Alemayehu wrote: > The attached patch is a workaround to the much discussed issue with VLC > hanging when opening a KDE file dialog. For the details about the causes of > this bug, see http://lists.kde.org/?t957244751&r=1&w=2 and the bug > repo

Re: Initial support for kde_projects.xml in kdesrc-build

On 04.02.11 00:33:58, David Faure wrote: > On Wednesday 02 February 2011, Alexander Neundorf wrote: > > On Wednesday 02 February 2011, Michael Pyne wrote: > > ... > > > > > e.g. worrying about environment variables like PKG_CONFIG_PATH is no idle > > > claim (kdesrc-build sets that as well), along

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

"Pino Toscano" writes: > kdecore/services/kmimetyperepository.cpp > > > I guess you should also add the /usr/local equivalent, and enclose both > in a > #ifdef Q_OS_UNIX > ... > #endif > block By the way, how welcome wou

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100539/ --- (Updated Feb. 4, 2011, 1:29 a.m.) Review request for kdelibs and David Fau

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100539/#review1188 --- kdecore/services/kmimetyperepository.cpp

Re: Initial support for kde_projects.xml in kdesrc-build

On Thu, Feb 3, 2011 at 6:29 PM, David Faure wrote: > On Wednesday 02 February 2011, Dawit A wrote: >> There never was any >> dependency, neither compile time nor run time, between kdebase and >> kwebkitpart. Never! > > Wrong. > kttsplugin was testing for kwebkitpart, before I ported it to > KParts

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100539/ --- (Updated Feb. 4, 2011, 12:11 a.m.) Review request for kdelibs and David Fa

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100539/ --- (Updated Feb. 4, 2011, 12:07 a.m.) Review request for kdelibs and David Fa

Re: Initial support for kde_projects.xml in kdesrc-build

On Wednesday 02 February 2011, Alexander Neundorf wrote: > On Wednesday 02 February 2011, Michael Pyne wrote: > ... > > > e.g. worrying about environment variables like PKG_CONFIG_PATH is no idle > > claim (kdesrc-build sets that as well), along with PATH in order to pick > > up the right Qt versi

Re: Initial support for kde_projects.xml in kdesrc-build

On Wednesday 02 February 2011, Dawit A wrote: > There never was any > dependency, neither compile time nor run time, between kdebase and > kwebkitpart. Never! Wrong. kttsplugin was testing for kwebkitpart, before I ported it to KParts::TextExtension. Not that mjansen really needs text-to-speech

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100539/#review1186 --- kdecore/services/kmimetyperepository.cpp

Re: Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100539/ --- (Updated Feb. 3, 2011, 11:23 p.m.) Review request for kdelibs and David Fa

Review Request: Workaround for the hang (freeze) when opening VLC's file dialog under KDE...

--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100539/ --- Review request for kdelibs and David Faure. Summary --- The attached

Re: Review Request: BMR: activity runner

--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100530/ --- (Updated Feb. 3, 2011, 8:36 p.m.) Review request for kdelibs. Changes --

Re: irc meeting for kdelibs git workflow

On Tuesday, February 1, 2011, Aaron J. Seigo wrote: > hi everyone ... > > with git having finally arrived more-or-less, we find ourselves without a > well defined work flow for kdelibs (and by extension other KDE > repositories) > > i don't think we can or should hope and pray that our sysadmins

Re: moving scratch repositories?

On Thursday 03 February 2011 19:28:44 Marco Martin wrote: > Hi all, > thi probably isn't going to be a good workflow for the future, but now that > kdelibs and base are just being converted i think would be a pretty common > problem. > > basically, what i have is some repositories (one born as gi

moving scratch repositories?

Hi all, thi probably isn't going to be a good workflow for the future, but now that kdelibs and base are just being converted i think would be a pretty common problem. basically, what i have is some repositories (one born as git, two converted from playground stuff in svn) that are meant to be

Re: Merge or Cherry-Pick?

Johannes Sixt wrote: > Am 2/3/2011 12:15, schrieb Hugo Pereira Da Costa: >> So I git cloned KDE/4.6 into some local branch (git checkout KDE/4.6; git >> checkout -b toolbuttons), then fix, then test. >> >> Now I want to merge to the KDE/4.6 branch; thats easy. >> >> Then I want to merge to master

Re: Merge or Cherry-Pick?

On Thursday 03 February 2011 08:57:00 Johannes Sixt wrote: > Am 2/3/2011 6:10, schrieb Dawit A: > > What happens if I tested a bug fix and wanted it to push it upstream > > so that it can receive even wider testing, but it just so happens the > > time to tag the next bug fix release is right around

Re: Merge or Cherry-Pick?

On Thu, Feb 3, 2011 at 4:10 AM, Stefan Majewsky wrote: > On Thu, Feb 3, 2011 at 6:21 AM, Dawit A wrote: >> git config --global push.default tracking >> >> and use the -t or --track option when creating your branches (branch >> or checkout -b). This way you can 'git push' (no arguments) in the >>

Re: Merge or Cherry-Pick?

Am 2/3/2011 13:42, schrieb Hugo Pereira Da Costa: > My understanding is also that people should refrain from cherry-picking > before > this original merge happens, cause that would only make it more painful. Not necessarily. When you cherry-pick from one branch to another, and this works withou

Re: Merge or Cherry-Pick?

On Thursday 03 February 2011 13:04:18 Johannes Sixt wrote: > Am 2/3/2011 12:15, schrieb Hugo Pereira Da Costa: > > So I git cloned KDE/4.6 into some local branch (git checkout KDE/4.6; git > > checkout -b toolbuttons), then fix, then test. > > > > Now I want to merge to the KDE/4.6 branch; thats e

Re: Merge or Cherry-Pick?

Am 2/3/2011 12:15, schrieb Hugo Pereira Da Costa: > So I git cloned KDE/4.6 into some local branch (git checkout KDE/4.6; git > checkout -b toolbuttons), then fix, then test. > > Now I want to merge to the KDE/4.6 branch; thats easy. > > Then I want to merge to master (or to some local branch cl

Re: Merge or Cherry-Pick?

Hey, So, I've followed the thread. Read everything, found it interesting, though there are some conflicting oppinions in there. Now, here is a practical case: https://bugs.kde.org/show_bug.cgi?id=265271 Its a one line change in workspace/kstyles/oxygen/oxygenstyle.cpp I want to follow the "mer

Re: Merge or Cherry-Pick?

On Thu, Feb 3, 2011 at 6:21 AM, Dawit A wrote: > git config --global push.default tracking > > and use the -t or --track option when creating your branches (branch > or checkout -b). This way you can 'git push' (no arguments) in the > current tracked branch without accidentally pushing your change

Re: Merge or Cherry-Pick?

please ignore this - I should have first read the rest of the thread - others already had the same arguments On Donnerstag 03 Februar 2011, Wolfgang Rohdewald wrote: > On Mittwoch 02 Februar 2011, Thiago Macieira wrote: > > > if I continue developing the app in master and fix some > > > bugs on th

Re: Merge or Cherry-Pick?

On Mittwoch 02 Februar 2011, Thiago Macieira wrote: > > if I continue developing the app in master and fix some bugs > > on the way, the fixes will be in master first. I would not > > always want to put them into 4.6 at once because testing in > > master is much easier and comes at much less cost w