Fixed local file handling prevented merges from being saved. Thin rapper class created to insure scheme is never blank. QUrl::isLocal returns false in this case.
On Sat, Jan 13, 2018 at 2:47 AM, Michael Reeves <reeves...@gmail.com> wrote: > Looks the original is a somewhat modified version of be348bcf1. It doesn't > have some of the windows specific code. Also kreplacements was not always > patched when updating code. I'm working on getting it updated with changes > Joachim has made. > > On Fri, Jan 12, 2018 at 12:21 AM, Joachim Eibl <joachim.e...@gmx.de> > wrote: > >> Hi, >> >> It's great to hear there is some ongoing effort to port KDiff3 to KF5. >> Thanks for informing me. >> I had a try at it myself, but was quite overwhelmed about the big changes >> in KF5. >> >> You have my blessing to use the name KDiff3. >> >> @Michael: It seems the repo at https://bitbucket.org/reporter123/kdiff3 >> has no public access. >> >> Kudos, >> Joachim >> >> >> *Gesendet:* Donnerstag, 11. Januar 2018 um 22:28 Uhr >> *Von:* "Michael Reeves" <reeves...@gmail.com> >> *An:* "Albert Astals Cid" <aa...@kde.org> >> *Cc:* kde-core-devel@kde.org, "Joachim Eibl" <joachim.e...@gmx.de> >> *Betreff:* Re: KDE inclusion >> Sorry meant this to go to everyone. >> >> I did this based off what Ubuntu was using at the time. The repo is here >> https://bitbucket.org/reporter123/kdiff3. Master is currently set the >> require CMake 3.1 but as of this moment that is just a number change. My >> concern here was C++11 feature dectect which is not implemented in earlier >> versions. Right now that is not critical. I was not aware of the parallel >> effort at https://cgit.kde.org/scratch/thomasfischer/kdiff3.git/log/?h >> =kf5. Command line parsing is fully operational on mine. To my knowledge >> it is fully operational and I have been using it on my machine. I generally >> work with two way comparisons. >> >> On Thu, Jan 11, 2018 at 6:24 PM, Albert Astals Cid <aa...@kde.org> >> wrote: >>> >>> El dijous, 11 de gener de 2018, a les 12:15:15 CET, Kevin Funk va >>> escriure: >>> > On Tuesday, 9 January 2018 21:06:36 CET Michael Reeves wrote: >>> > > I have a version of kdiff3 that I ported to kf5. I like to what build >>> > > requirements kf5 as a whole has. Also what would be the process for >>> being >>> > > considered for inclusion in kde? >>> > >>> > Heya, >>> > >>> > Note: kdiff3 right now is hosted & developed on SourceForge. >>> > >>> > I'd love to see kdiff3 being adopted by KDE again (it former was KDE >>> > extragear if I understood correctly). kdiff3 is a super useful tool -- >>> and >>> > right now development has stalled a bit. >>> > >>> > Talked to Joachim (the original author) a few weeks ago, where he >>> stated he >>> > just doesn't have the time maintaining it anymore, really. I've CC'd >>> Joachim >>> > so he can tell us whether he's okay with having kdiff3 developed >>> further >>> > under the KDE umbrella. >>> >>> I guess this is the most important question, if we can keep using the >>> kdiff3 >>> name under's Joachim's blessing or we have to "fork it" and find a new >>> name. >>> >>> Cheers, >>> Albert >>> >>> > >>> > I don't really know the process of having it integrated either. I'll >>> leave >>> > that to others. >>> > >>> > Kudos for doing the KF5 port! >>> > >>> > Regards, >>> > Kevin >>> >>> >>> >> >
