Git policy: git merge or git cherry-pick

Hello, I would like to have your opinion about the preferable and consistent way of merging of the code from the features branches we have into master. There are more ways: 1. git cherry-picking a) cherrypick single commits b) produce one squashed patch for master and commit it 2. git merge We

Re: Git policy: git merge or git cherry-pick

> git checkout master > git merge flake-odf-gluepoints... > git pull --rebase > git push > > Ciao Jan Thanks Jan. I also did "git merge --log" with the branch with TOC feature. That --log was suggested by boud, it shows more verbose commit message. For the nice commit message you need to commit

koabstraction and compiling error

Hello, would you somebody fix the compilation of the calligra when apps like words, tables and stage are turned off from compilation? Krita users/developers usually compile only Krita so this compilation error occurs [1] The solution is to turn off the compilation of the koabstraction but then I

Re: Suite version number

> While in theory it can be Calligra 1.0 but I am definitely not for > Kexi 1.0 and Krita 1.0. +1 from me.. No Krita 1.0, please :) ___ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel

Re: spring cleaning of branches

> remotes/origin/words-toc-korinek-tvrdy I asked for removing of this one right after the merge process. I don't know why it is still around, so feel free to remove. ___ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/list

Re: Calligra userbase page

I would not put Flow in Creativity Applications. I find it office application. For me creativity category is for creating some form of art. I haven't seen much art with diagrams yet :) 2011/4/18 Cyrille Berger Skott : > Hi, > > In preparation of the first calligra snapshot release, I have put som

Re: The state of Calligra Words (a call for testing)

I would wait. It's broken. 2011/5/6 Cyrille Berger Skott : > I did not tag yesterday, because I lost the release script :( > > But after seeing this on IRC, I am not sure if we shouldn't wait a little: > > 08:26 < Zagge> words is totally broken :-( > 08:27 < Zagge> boemann: sebsauer: if you type t

Reverting commits

Matus, please, first discuss the revert with the author and then revert. Thank you Lukas ___ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel

nofill and nostroke support problem

Hello, Zagge discovered major problem for the nofill, nostroke patch. I would like to ask you for help how to make proper support for nofill, nostroke. Currently I decided to implement the idea to render subpaths separately so that I can turn off stroke and fill. But... > 1. When a shape has a f

Re: nofill and nostroke support problem

Hello, so far no response...we had discussion with boemann, so I paste it here, maybe it will inspire somebody for some idea. (11:47:40 AM) boemann: LukasT: suggestion: paint fill and outline as two steps (11:48:13 AM) boemann: if say nostroke the just replace that part of the path with a move (

enhanced-shape and A,W command definitions

Hello, I was fixing bug https://bugs.kde.org/show_bug.cgi?id=277540 and I noticed that OpenOffice and MS Office render the W command differently. MS Office 2007 rendering http://wstaw.org/m/2011/07/18/round-callout_ms2007.png OpenOffice http://wstaw.org/m/2011/07/18/round-callout_ooo.png We ren

Re: enhanced-shape and A,W command definitions

Similar problem is with T and U T Draws a segment of an ellipse. The ellipse is specified by the center(x, y), the size(w, h) and the start-angle t0 in degrees and end-angle t1 in degrees. U The same as the “T” command, except that a implied moveto to the starting point is done. According my tes

Re: Review Request: remove split view functionality

> It's not like other apps all have this feature For Krita this feature is useful and it is found in Gimp like this : View -> Add View. It's not visually the same, you get new float window, but it is view on the same document. It will be missed feature, but nobody maintains it and it is very bugg

Re: [calligra] krita: Port Krita fully to the NG iterators.

Hi, > This brings up the point that all devs (incl krita) should (i would say must) > be subscribed to calligra-devel mailing list. It doesn't contain many messages > besides such important stuff. I'm subscribed, but from my pov it does sometimes contain quite a lot of mails and I don't read ever

Re: [calligra] libs/pigment/tests: disable the composite op test

Hi, do we have some mechanism to say : expect_fail ? That would be better solution and the test would "pass" Lukas 2013/3/12 Boudewijn Rempt : > Git commit bbd1958cbf6a628297fe65a3c3e15d7dd69b9a74 by Boudewijn Rempt. > Committed on 12/03/2013 at 13:02. > Pushed by rempt into branch 'master'. > >

Re: Coffice milestone 2

Hello, great work! Btw why do you ship gdbserver in apk? Because of debug version? That would be 137kb less ;) ___ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel

Re: Callgira 2.7 Beta 2

Hi Friedrich, > Any reasons against using xz known? I was wondering if Windows has tools to unpack xz and yes, 7-zip can do that :) +1 for xz ___ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel

How to merge rebased branch properly?

Hello, recently I did this command in my branch krita-gmic-ltvrdy: git pull --rebase origin master It merged somehow master into my branch and rebased all commits of branch on top, then when I pushed some new commits, it also managed to push some commits again (rebased ones) I had to merge, wei

Re: How to merge rebased branch properly?

DmitryK mentioned some other possibility to preserve history, to create another branch and merge that new branch. I would like to preserve the commits as I dropped some code that might be needed again and squash will destroy history of the branch. Dmitry,can you explain the solution with more det

Re: How to merge rebased branch properly?

a-gmic-ltvrdy-2nd-try # create a new branch, so > that no conflicts would happen > 3) git push origin krita-gmic-ltvrdy-2nd-try > > After that, if you think you commits in the branch are ok and bisectable, > you can merge this branch to master as usual. > > > > > On Su

Re: [calligra] krita/plugins/extensions/gmic: Fix typo

Hi Yuri, please, do not change gmic copy in krita extension. It will be synced with upstream releases in the future and your commits will be lost. Please commit to upstream at http://gmic.sourceforge.net Thanks Lukas 2013/10/21 Yuri Chornoivan > Git commit cce64b6094eb5eccb4213aa826a5e77a335a