Re: Review Request 122045: Calligra filters: refactor chart handling and make it sane

2015-01-21 Thread Lassi Nieminen
--- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/122045/#review74521 --- Ooxml related parts look fine to me. - Lassi Nieminen On Ja

Re: OOOOPS

2015-01-21 Thread René J . V . Bertin
On Wednesday January 21 2015 20:51:29 Jaroslaw Staniek wrote: What's curious is that my working copy seems to have all files with the changes up to and including commit c052d06a923a849a8bd83f4529b7a52208a7a699 , plus of course the single point change I intended to commit. I'm talking of the 2.9

Re: OOOOPS

2015-01-21 Thread Jaroslaw Staniek
Btw, extra recommended from my workflow: use git cherry -v origin/calligra/2.9 prior to pushing. On Wednesday, 21 January 2015, René J.V. wrote: > On Wednesday January 21 2015 19:02:07 Adam Pigg wrote: >> I wrote myself a reminder >> https://userbase.kde.org/User:Piggz/CalligraWorkflowInANutshell

Re: OOOOPS

2015-01-21 Thread Jaroslaw Staniek
I'd vote for editing history or else git blame and bisect becomes rather broken. ASAP... before too many folks have to do local fix, namely removing calligra/2.9 local branch or: http://stackoverflow.com/questions/9813816/git-pull-after-forced-update On Wednesday, 21 January 2015, René J.V. wrote

Re: OOOOPS

2015-01-21 Thread René J . V . Bertin
On Wednesday January 21 2015 19:02:07 Adam Pigg wrote: > I wrote myself a reminder > https://userbase.kde.org/User:Piggz/CalligraWorkflowInANutshell > maybe it will help > > On Wed Jan 21 2015 at 18:51:00 Jaroslaw Staniek wrote: > > > Other advices: > > Use git-new-workdir (explained on this lis

Re: OOOOPS

2015-01-21 Thread Adam Pigg
I wrote myself a reminder https://userbase.kde.org/User:Piggz/CalligraWorkflowInANutshell maybe it will help On Wed Jan 21 2015 at 18:51:00 Jaroslaw Staniek wrote: > Other advices: > Use git-new-workdir (explained on this list and on the wiki) > Use git pull -rebase > > > On Wednesday, 21 Januar

Re: OOOOPS

2015-01-21 Thread Jaroslaw Staniek
Other advices: Use git-new-workdir (explained on this list and on the wiki) Use git pull -rebase On Wednesday, 21 January 2015, René J.V. wrote: > On Wednesday January 21 2015 18:38:25 Stefano Bonicatti wrote: > >> You didn't reverted commits, you had an "old" branch apparently and did a >> merg

OOOOPS

2015-01-21 Thread Jaroslaw Staniek
Hi, Next time please use rebase to have only single commits. Now ideally we would need the history to be edited by an admin or at least commits repushed exactly as they were... On Wednesday, 21 January 2015, René J.V. wrote: > :-( > > Not sure what I did wrong trying to commit a point change in

Re: OOOOPS

2015-01-21 Thread René J . V . Bertin
On Wednesday January 21 2015 18:38:25 Stefano Bonicatti wrote: > You didn't reverted commits, you had an "old" branch apparently and did a > merge of your fix instead of a fast-forward (if you look carefully to the Yes, that I know. For once I followed git's commands because I had already commit

Re: OOOOPS

2015-01-21 Thread Stefano Bonicatti
You didn't reverted commits, you had an "old" branch apparently and did a merge of your fix instead of a fast-forward (if you look carefully to the diffs, for instance in kis_opengl.cpp, what it seems you changed it's actually what commit f888e07e0667ce0ce289db6c2e51fd5a2a99ace2 did). I think that

OOOOPS

2015-01-21 Thread René J . V . Bertin
:-( Not sure what I did wrong trying to commit a point change in a single file that I introduced a regression in, but that commit seems to have reverted a number of changes: http://quickgit.kde.org/?p=calligra.git&a=commit&h=2c40d8b87db167dd1d77341daabb2ed7837ee46b mea culpa, and if I knew how

Re: Sysadmin report on the modernization of our infrastructure

2015-01-21 Thread Boudewijn Rempt
Hi, I am all for the proposal -- though I would like to use Phabricator for issue tracking as well, actually. I would also like to propose Calligra/Krita as one of the test projects. On Wednesday 21 January 2015 Jan 17:12:07 Ben Cooksley wrote: > Hi all, > > As promised in the earlier thread,