Re: Merge or Cherry-Pick?

2011-02-05 Thread Thiago Macieira
On Saturday, 5 de February de 2011 00:16:03 Tom Albers wrote: - Original Message - this will get us used to the merge workflow which starts with fix it in the stable branch first. So, in conclusion, we did not pick a tool which fits our workflow, instead we are now adjusting

Re: Review Request: KIOSlave implementing computer: protocol

2011-02-05 Thread Andrius Ribas
--- This is an automatically generated e-mail. To reply, visit: http://svn.reviewboard.kde.org/r/6207/#review9813 --- I'll rewrite the patch for git.reviewboard.kde.org but I'd like

Re: Keyboard shortcuts get wild.

2011-02-05 Thread Alexander Neundorf
On Saturday 05 February 2011, Mark wrote: Hi, let me first point you to this image (kde 4.6.0) : http://img89.imageshack.us/img89/5398/rightmousebuttondesktop.png Oke, first one shortcut in that image. I consider myself a experienced computer user in both windows and linux but today i

Review Request: Fix a VLC crash by delaying object deletion to avoid invalid access by QtDBus...

2011-02-05 Thread Dawit Alemayehu
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100577/ --- Review request for kdelibs. Summary --- As described in the bug

Re: Keyboard shortcuts get wild.

2011-02-05 Thread Michael Jansen
On Saturday 05 February 2011 17:51:16 Mark wrote: Hi, let me first point you to this image (kde 4.6.0) : http://img89.imageshack.us/img89/5398/rightmousebuttondesktop.png Oke, first one shortcut in that image. I consider myself a experienced computer user in both windows and linux but

Re: Review Request: Fix a VLC crash by delaying object deletion to avoid invalid access by QtDBus...

2011-02-05 Thread Dawit A
On Sat, Feb 5, 2011 at 12:57 PM, Thiago Macieira thi...@kde.org wrote: On Saturday, 5 de February de 2011 17:39:35 Dawit Alemayehu wrote: was that in both cases the backtrace shows QtDBus attempting to invoke or access some method or slot in the object that was just destroyed. At this That's

Re: Review Request: Fix a VLC crash by delaying object deletion to avoid invalid access by QtDBus...

2011-02-05 Thread Thiago Macieira
On Saturday, 5 de February de 2011 14:15:03 Dawit A wrote: On Sat, Feb 5, 2011 at 12:57 PM, Thiago Macieira thi...@kde.org wrote: On Saturday, 5 de February de 2011 17:39:35 Dawit Alemayehu wrote: was that in both cases the backtrace shows QtDBus attempting to invoke or access some method

git won't let me delete a branch?

2011-02-05 Thread Thomas Lübking
Hi, i've accidentally pushed a 4.6 (NOT KDE/4.6) branch to remote (sorry), where it does oc. not belong... However git push origin :4.6 fails by: remote: D refs/heads/4.6 kde-workspace luebking DENIED by fallthru remote: error: hook declined to update refs/heads/4.6 To

Re: git won't let me delete a branch?

2011-02-05 Thread Ben Cooksley
On Sun, Feb 6, 2011 at 8:58 AM, Thomas Lübking thomas.luebk...@gmail.com wrote: Hi, i've accidentally pushed a 4.6 (NOT KDE/4.6) branch to remote (sorry), where it does oc. not belong... However git push origin :4.6 fails by: remote: D refs/heads/4.6 kde-workspace luebking DENIED by

Re: git won't let me delete a branch?

2011-02-05 Thread John Tapsell
On 5 February 2011 20:03, Ben Cooksley bcooks...@kde.org wrote: On Sun, Feb 6, 2011 at 8:58 AM, Thomas Lübking thomas.luebk...@gmail.com wrote: Hi, i've accidentally pushed a 4.6 (NOT KDE/4.6) branch to remote (sorry), where it does oc. not belong... However git push origin :4.6 fails by:

Re: moving scratch repositories?

2011-02-05 Thread John Tapsell
Btw, since it wasn't obvious to me at the start, git branches can be from completely different repositories, even completely unrelated ones. You can do git add remote to add new repositories. Then you can use cherry-pick to move patches from one repository to the other. As long as the paths

Re: git won't let me delete a branch?

2011-02-05 Thread Thomas Lübking
Am 05.02.2011, 21:03 Uhr, schrieb Ben Cooksley bcooks...@kde.org: Only repository admins are allowed to delete branches on git.kde.org. I have now deleted this branch. Ok, thanks alot - and sorry again. Cheers, Thomas

Re: git won't let me delete a branch?

2011-02-05 Thread Stefan Majewsky
On Sat, Feb 5, 2011 at 9:12 PM, John Tapsell johnf...@gmail.com wrote: The way that it works for the public Qt repository is that no one can create or delete branches.  But anyone can clone the repository, and then create/delete branches there as they want. Shouldn't we have something