Re: Merge or Cherry-Pick?

2011-02-03 Thread Dawit A
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 '

Re: Merge or Cherry-Pick?

2011-02-02 Thread Dawit A
On Wed, Feb 2, 2011 at 1:03 PM, Dawit A wrote: > Would someone be so kind to tell me how to undo accidentally pushed > commits to trunk ? By accident I pushed the following commits to trunk > when I only meant to push backported fixes in 4.6 branch: > > http://quickgit.kde.org/?

Re: Merge or Cherry-Pick?

2011-02-02 Thread Dawit A
ding regression elsewhere. Thankfully for the most part the regressions were caught before the fix was backported into the stable branch. Anyhow, I still do not see why things should first go into the stable branch except that is a more appropriate way of merging/tracking code in git ?? Regrads, Dawit A.

Re: Merge or Cherry-Pick?

2011-02-02 Thread Dawit A
On Wed, Feb 2, 2011 at 1:49 PM, Pino Toscano wrote: > Alle mercoledì 2 febbraio 2011, Dawit A ha scritto: >> Would someone be so kind to tell me how to undo accidentally pushed >> commits to trunk ? > > $ git revert SHA > >> http://quickgit.kde.org/?p=kdelibs.git

Re: Merge or Cherry-Pick?

2011-02-02 Thread Dawit A
Would someone be so kind to tell me how to undo accidentally pushed commits to trunk ? By accident I pushed the following commits to trunk when I only meant to push backported fixes in 4.6 branch: http://quickgit.kde.org/?p=kdelibs.git&a=commit&h=e6f00fdd71328b26e57ef09e97e4aca569c4199c http://qui

Re: Merge or Cherry-Pick?

2011-02-01 Thread Dawit A
On Wed, Feb 2, 2011 at 2:02 AM, Kevin Ottens wrote: > On Wednesday 2 February 2011 07:21:44 Dawit A wrote: >> On Wed, Feb 2, 2011 at 12:58 AM, John Tapsell wrote: >> >> But how would a similar work flow except there are multiple fixes >> >> present in the local

Re: Merge or Cherry-Pick?

2011-02-01 Thread Dawit A
On Wed, Feb 2, 2011 at 12:58 AM, John Tapsell wrote: >> But how would a similar work flow except there are multiple fixes >> present in the local repo ? How would you push only a single fix in >> such case ? > > git rebase -i origin   #Bring up a list of your changes. > > the top of the list, sav

Re: Merge or Cherry-Pick?

2011-02-01 Thread Dawit A
ommitted ? There is probably easier way to do things in git, but despite reading several articles and documentation on git, it is not easy to figure out the uses of git for own work flow for first time users like myself. Perhaps compiling answers for the easiest way to handle the most common work flows being discussed here would be a good starting point for a guide that can be put on techbase... Regards, Dawit A.

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

2011-02-01 Thread Dawit A
om kwebkitpart. That was it. Not being able to use optional plugins under an optional kpart component. Nothing more, nothing less. As such your example is completely incorrect for this particular case. However, I understand the larger point you are trying to about issues related to convoluted dependencies... Regards, Dawit A.

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

2011-02-01 Thread Dawit A
On Tue, Feb 1, 2011 at 4:14 PM, Michael Jansen wrote: > >> a. nope. kwebkitpart only depends on kdelibs! There are no >> requirements besides that. The previous requirement that you must >> build kwebkitpart before you compiled the konq-plugins, which have now >> been moved to kdebase, is now

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

2011-02-01 Thread Dawit A
On Tue, Feb 1, 2011 at 2:58 PM, Michael Jansen wrote: > On Tuesday 01 February 2011 20:35:27 Alexander Neundorf wrote: >> On Tuesday 01 February 2011, Michael Jansen wrote: >> > On Tuesday 01 February 2011 19:53:40 Alexander Neundorf wrote: >> > > On Monday 31 January 2011, Aaron J. Seigo wrote: >

Re: Merge or Cherry-Pick?

2011-01-31 Thread Dawit A
On Mon, Jan 31, 2011 at 5:27 PM, Thiago Macieira wrote: > On Monday, 31 de January de 2011 22:58:52 Andreas Pakulat wrote: >> Hi, >> >> something that hasn't been written down as far as I can see (if I >> overlooked it, please point me to it) is what the policy on kdelibs is >> to be now wrt. merg

Re: The hidden problem with using QProcess/KProcess in kdelibs...

2011-01-23 Thread Dawit A
On Sun, Jan 23, 2011 at 4:41 AM, Thiago Macieira wrote: > On Saturday, 22 de January de 2011 17:16:10 Dawit A wrote: > > The above snippet of code is something I clipped from > > > http://git.videolan.org/?p=vlc.git;a=blob;f=bin/vlc.c;h=70eeed0d2299e2f3cf0c > > 2f68

Re: The hidden problem with using QProcess/KProcess in kdelibs...

2011-01-22 Thread Dawit A
On Sat, Jan 22, 2011 at 5:16 PM, Dawit A wrote: > On Sat, Jan 22, 2011 at 3:55 PM, Thiago Macieira wrote: >> On Saturday, 22 de January de 2011 14:25:07 Dawit A wrote: >>> Anyhow, this problem is not specific to VLC and can happen to any Qt >>> application that bloc

Re: The hidden problem with using QProcess/KProcess in kdelibs...

2011-01-22 Thread Dawit A
On Sat, Jan 22, 2011 at 3:55 PM, Thiago Macieira wrote: > On Saturday, 22 de January de 2011 14:25:07 Dawit A wrote: >> Anyhow, this problem is not specific to VLC and can happen to any Qt >> application that blocks the SIGCHLD signals from reaching any of the >> threads.

The hidden problem with using QProcess/KProcess in kdelibs...

2011-01-22 Thread Dawit A
rhaps it is QProcess that should be taking care of this itself ? Regards, Dawit A.

KSharedDataCache warning message...

2011-01-14 Thread Dawit A
Can the warning message below be commented out if it is not critical ? It simply overwhelms my ~/.xsession-errors file to the point where I cannot look for other error messages. */KSharedDataCache: Trying to remove an entry which is already invalid. This cache is likely corrupt.

Re: kdewebkit fails to build with Mobile profile in trunk

2011-01-11 Thread Dawit A
On Tue, Jan 11, 2011 at 12:55 PM, Kevin Ottens wrote: > On Tuesday 11 January 2011 02:31:35 Marijn Kruisselbrink wrote: >> [1] >> https://build.pub.meego.com/package/view_file?file=02_kdelibs_compile.patch >> &package=kdelibs&project=home%3Amkruisselbrink%3Akde&srcmd5=20a6530bdfdd79b >> d06c3ace11

Re: kdewebkit fails to build with Mobile profile in trunk

2011-01-10 Thread Dawit A
On Sun, Dec 26, 2010 at 3:07 PM, Andriy Rysin wrote: > Commenting out two deprecated methods helped but that's probably a wrong > solution. > > In file included from > /home/kdeuser/work/OSS/KDE/kdelibs/kdewebkit/kgraphicswebview.cpp:85:0: > /home/kdeuser/kde/build/KDE/kdelibs/kdewebkit/kgraphicsw

Re: phononserver phonondevicesrc OpenFlag, askToRemove

2011-01-06 Thread Dawit A
Cannot help you out with your question, but I think you would be best served if you asked it over at the kde-multimedia mailing list... On Thu, Jan 6, 2011 at 12:38 PM, Edgar Fuß wrote: > I hope I'm right on this list with my question. > > Is there a reason for phononserver.cpp to open the phonon

Request to add a new API to KIO::AccessManager for KDE 4.6...

2010-12-22 Thread Dawit A
I have to add a new API, a static function, to KIO::Integration::AccessManager in order to fix a long standing bug. You can find the details at http://reviewboard.kde.org/r/6183/. An objections ?

Re: Issues with Solid from trunk and qtcreator 2.0.1...

2010-11-10 Thread Dawit A
On Wed, Nov 10, 2010 at 3:41 AM, Thiago Macieira wrote: > On Wednesday, 10 de November de 2010 09:32:48 Dawit A wrote: >> sigh I got everthing crossed up! Indeed since this is the system bus >> a sendmsg here is response back to the client. For some reason this >> response

Re: Issues with Solid from trunk and qtcreator 2.0.1...

2010-11-10 Thread Dawit A
On Wed, Nov 10, 2010 at 3:14 AM, Thiago Macieira wrote: > On Wednesday, 10 de November de 2010 09:04:02 Dawit A wrote: >> I cannot figure out when the reply was sent back because there is a >> lot of chatter on the system dbus, but I definitely see the pause >> after the

Re: Issues with Solid from trunk and qtcreator 2.0.1...

2010-11-10 Thread Dawit A
Well On Sat, Nov 6, 2010 at 6:09 PM, Thiago Macieira wrote: > On Saturday, 6 de November de 2010 13:58:33 Dawit A wrote: >> Hmm... if the call times out though, why doesn't it return an error ? >> I get back the expected reply for the introspection call instead... > >

Re: Issues with Solid from trunk and qtcreator 2.0.1...

2010-11-06 Thread Dawit A
On Sat, Nov 6, 2010 at 2:15 AM, Dawit A wrote: > On Sat, Nov 6, 2010 at 12:35 AM, Thiago Macieira wrote: >> On Friday, 5 de November de 2010 18:54:43 Dawit A wrote: >>> > Can you give me a "thr apply all bt full" of this lockup? >>> >>> I guess I

Re: Issues with Solid from trunk and qtcreator 2.0.1...

2010-11-05 Thread Dawit A
On Sat, Nov 6, 2010 at 12:35 AM, Thiago Macieira wrote: > On Friday, 5 de November de 2010 18:54:43 Dawit A wrote: >> > Can you give me a "thr apply all bt full" of this lockup? >> >> I guess I would need to recompile both qt and dbus in debug mode for >>

Re: Issues with Solid from trunk and qtcreator 2.0.1...

2010-11-05 Thread Dawit A
On Fri, Nov 5, 2010 at 9:21 PM, Thiago Macieira wrote: > On Friday, 5 de November de 2010 16:25:46 Dawit A wrote: >> On Fri, Nov 5, 2010 at 3:07 PM, Thiago Macieira wrote: >> > On Thursday, 4 de November de 2010 18:15:31 Dawit A wrote: >> >> QDBusConnectionPriv

Re: Issues with Solid from trunk and qtcreator 2.0.1...

2010-11-05 Thread Dawit A
On Fri, Nov 5, 2010 at 3:07 PM, Thiago Macieira wrote: > On Thursday, 4 de November de 2010 18:15:31 Dawit A wrote: >> QDBusConnectionPrivate(0x1f9b8b0) sending message (blocking): >> QDBusMessage(type=MethodCall, service="org.freedesktop.UDisks", >> path="/o

Re: Issues with Solid from trunk and qtcreator 2.0.1...

2010-11-04 Thread Dawit A
On Thu, Nov 4, 2010 at 5:24 PM, Kevin Ottens wrote: > On Thursday 4 November 2010 18:58:09 Dawit A wrote: >> BTW, I noticed a couple of things in UDisksManager that I want to ask >> about... The first issue is why does a device that has its >> "DeviceIsOpticalDisc"

Re: Issues with Solid from trunk and qtcreator 2.0.1...

2010-11-04 Thread Dawit A
BTW, I noticed a couple of things in UDisksManager that I want to ask about... The first issue is why does a device that has its "DeviceIsOpticalDisc" property set to true inserted into the m_deviceCache 2x, once normally and once with ":media" attached to it ? The second issue is why even bother w

Re: Issues with Solid from trunk and qtcreator 2.0.1...

2010-11-04 Thread Dawit A
On Thu, Nov 4, 2010 at 3:06 AM, Kevin Ottens wrote: > On Thursday 4 November 2010 02:00:40 Dawit A wrote: >> On Wed, Nov 3, 2010 at 3:24 PM, Lukáš Tinkl wrote: >> > Thanks, I'll look into it tomorrow... things can definitely get faster :) >> >> To that e

Re: Issues with Solid from trunk and qtcreator 2.0.1...

2010-11-03 Thread Dawit A
On Wed, Nov 3, 2010 at 3:24 PM, Lukáš Tinkl wrote: > Dne Út 2. listopadu 2010 21:09:10 Dawit A napsal(a): >> On Mon, Nov 1, 2010 at 2:28 PM, Lukáš Tinkl wrote: >> > Dne Po 1. listopadu 2010 18:25:33 Dawit A napsal(a): >> >> On Mon, Nov 1, 2010 at 10:19 AM, Lukáš T

Re: Issues with Solid from trunk and qtcreator 2.0.1...

2010-11-02 Thread Dawit A
On Mon, Nov 1, 2010 at 2:41 PM, Lukáš Tinkl wrote: > Dne Po 1. listopadu 2010 19:24:55 Alexis Ménard napsal(a): >> It's a supposed threading issue in dbus that has been fixed in the >> latest version 1.4.0 >> >> I'm running Archlinux and I got the upgrades some weeks ago. The >> problem disappeare

Re: Issues with Solid from trunk and qtcreator 2.0.1...

2010-11-02 Thread Dawit A
On Mon, Nov 1, 2010 at 2:28 PM, Lukáš Tinkl wrote: > Dne Po 1. listopadu 2010 18:25:33 Dawit A napsal(a): >> On Mon, Nov 1, 2010 at 10:19 AM, Lukáš Tinkl wrote: >> > Dne Ne 31. října 2010 03:32:52 Dawit A napsal(a): >> >> On Wed, Oct 27, 2010 at 12:24 PM, Dawit A

Re: Issues with Solid from trunk and qtcreator 2.0.1...

2010-11-01 Thread Dawit A
t; problem disappeared since then... I too run Arch Linux x86-64... > On Mon, Nov 1, 2010 at 10:25 AM, Dawit A wrote: >> On Mon, Nov 1, 2010 at 10:19 AM, Lukáš Tinkl wrote: >>> Dne Ne 31. října 2010 03:32:52 Dawit A napsal(a): >>>> On Wed, Oct 27, 2010 at 12:24 PM,

Re: Issues with Solid from trunk and qtcreator 2.0.1...

2010-11-01 Thread Dawit A
On Mon, Nov 1, 2010 at 10:19 AM, Lukáš Tinkl wrote: > Dne Ne 31. října 2010 03:32:52 Dawit A napsal(a): >> On Wed, Oct 27, 2010 at 12:24 PM, Dawit A wrote: >> > On Wed, Oct 27, 2010 at 7:48 AM, Lukáš Tinkl wrote: >> >> Dne St 27. října 2010 00:57:27 Christophe G

Re: Issues with Solid from trunk and qtcreator 2.0.1...

2010-10-30 Thread Dawit A
On Wed, Oct 27, 2010 at 12:24 PM, Dawit A wrote: > On Wed, Oct 27, 2010 at 7:48 AM, Lukáš Tinkl wrote: >> Dne St 27. října 2010 00:57:27 Christophe Giboudeaux napsal(a): >>> Hi, >>> >>> Le 27/10/2010 00:20, Dawit A a écrit : >>> > Does anyone

<    1   2