Hi, I looked into the diff and I see following things like -
- Issue with the history plugin - I have addressed it with this review request Link - https://phabricator.kde.org/D7635 History plugin is revived as well and is working correctly after this RR. Though some issues need to be fixed on Import History Part. I am working on it. - Issue with the external libiris bundle - changes in this are all of dropping off the not required files and unused headers so we can drop off all the changed in this and it will still work fine. I don't know yet how to drop specific changes of the file or a directory. I will look it up and will submit a patch. I have tested it by building it on my system and checking it out on my account of Gmail. It works correctly. Regards, Vijay Krishnavanshi On 19 August 2017 at 21:33, vijay krishnavanshi < vijaykrishnavan...@gmail.com> wrote: > Hi, > > I was asking for force pushing the new branch in your clone repo. I am > thinking how can the issues in the rebase branch be addressed. > > Another thing I want to ask is that why do we need this rebased branch, > all the code is already there in the master branch and gives a working > executable. Why address the merge conflicts? Is it because we want linear > history or something else entirely. > > Regards, > Vijay Krishnavanshi > > On 19 August 2017 at 21:24, Pali Rohár <pali.ro...@gmail.com> wrote: > >> There is one problem with kf5 branch and merges... kf5 branch contains >> more commits which were later applied into master branch, but slightly >> different (e.g. in master branch were fixed problems). This results >> probably in those merge conflicts which were somehow fixed. >> >> The whole rebase which I did into new branch is without preserving merge >> commits and taking commits from master branch if one with "same commit >> message" was also in kf5 branch (as that one in master branch is >> correct). >> >> When you work, you should never do force pushes into main kopete >> repository. I think that force pushes are also disabled on kde servers >> for main kopete repository. >> >> In own cloned repositories, owner of clone can do what he wants, it is >> his own copy. >> >> On Saturday 19 August 2017 21:03:28 vijay krishnavanshi wrote: >> > Should I force push my branch also? Sorry for not tagging the >> kopete-devel >> > in above email. >> > >> > Regards, >> > Vijay Krishnavanshi >> > >> > On 19 August 2017 at 21:01, vijay krishnavanshi < >> > vijaykrishnavan...@gmail.com> wrote: >> > >> > > Okay, >> > > I am working on it and trying to fix the issues in it. Diff is >> because of >> > > the merges I tried doing rebase of kf5 on master by using the command >> "git >> > > rebase master --preserve-merges". After fixing the issues in this it >> leaves >> > > me with the branch and non significant changes between the rebased >> branch >> > > and kf5 one. >> > > --preserve-merges saves the merge commits also leaving us with less >> issues >> > > to be resolved. I might be wrong also but as of now I don't see any >> build >> > > issues. >> > > >> > > Regards, >> > > Vijay Krishnavanshi >> > > >> > > On 19-Aug-2017 11:47, "Pali Rohár" <pali.ro...@gmail.com> wrote: >> > > >> > >> There was some problem with this clone repository, kde sysadmin >> fixed it >> > >> >> > >> https://cgit.kde.org/clones/kopete/pali/kopete.git/log/?h=master-kf5 >> > >> >> > >> >> > >> >> >> -- >> Pali Rohár >> pali.ro...@gmail.com >> > >
