Re: Rebase of kopete branch and push it to master

On Thu, Jan 25, 2018 at 11:26 AM, Pali Rohár wrote: > On Friday 19 January 2018 21:56:10 Ben Cooksley wrote: >> On Fri, Jan 19, 2018 at 12:06 PM, Pali Rohár wrote: >> > On Thursday 18 January 2018 20:50:35 Ben Cooksley wrote: >> >> Hi all, >> >> >> >>

Re: Rebase of kopete branch and push it to master

On Friday 19 January 2018 21:56:10 Ben Cooksley wrote: > On Fri, Jan 19, 2018 at 12:06 PM, Pali Rohár wrote: > > On Thursday 18 January 2018 20:50:35 Ben Cooksley wrote: > >> Hi all, > >> > >> I have now completed the merge from Pali's clone repository into the > >> 'master'

Re: Rebase of kopete branch and push it to master

On Fri, Jan 19, 2018 at 12:06 PM, Pali Rohár wrote: > On Thursday 18 January 2018 20:50:35 Ben Cooksley wrote: >> Hi all, >> >> I have now completed the merge from Pali's clone repository into the >> 'master' branch of the main Kopete repository. >> Phabricator processing of

Re: Rebase of kopete branch and push it to master

On Thursday 18 January 2018 20:50:35 Ben Cooksley wrote: > Hi all, > > I have now completed the merge from Pali's clone repository into the > 'master' branch of the main Kopete repository. > Phabricator processing of all the commits has been completed without incident. Hi! Thank you very very

Re: Rebase of kopete branch and push it to master

Hi all, I have now completed the merge from Pali's clone repository into the 'master' branch of the main Kopete repository. Phabricator processing of all the commits has been completed without incident. Pali, please revise the metadata accordingly in sysadmin/repo-metadata (for i18n) and

Re: Rebase of kopete branch and push it to master

Pali Rohár ha scritto: > On Tuesday 16 January 2018 23:05:42 Albert Astals Cid wrote: >> El dimarts, 16 de gener de 2018, a les 0:45:27 CET, Pali Rohár va escriure: >>> On Tuesday 16 January 2018 00:32:44 Albert Astals Cid wrote: El dimarts, 16 de gener de 2018, a les 0:09:50 CET, Pali Rohár

Re: Rebase of kopete branch and push it to master

On Tuesday 16 January 2018 23:05:42 Albert Astals Cid wrote: > El dimarts, 16 de gener de 2018, a les 0:45:27 CET, Pali Rohár va escriure: > > On Tuesday 16 January 2018 00:32:44 Albert Astals Cid wrote: > > > El dimarts, 16 de gener de 2018, a les 0:09:50 CET, Pali Rohár va > escriure: > > > >

Re: Rebase of kopete branch and push it to master

El dimarts, 16 de gener de 2018, a les 21:56:34 CET, Ben Cooksley va escriure: > I won't > be proceeding with the push if it clashes with an Applications module > release or freeze for which an exception has not been granted. kopete is not part of KDE Applications 17.12 since it didn't make it on

Re: Rebase of kopete branch and push it to master

El dimarts, 16 de gener de 2018, a les 0:45:27 CET, Pali Rohár va escriure: > On Tuesday 16 January 2018 00:32:44 Albert Astals Cid wrote: > > El dimarts, 16 de gener de 2018, a les 0:09:50 CET, Pali Rohár va escriure: > > > On Tuesday 16 January 2018 00:06:29 Albert Astals Cid wrote: > > > > So

Re: Rebase of kopete branch and push it to master

On 16.01.2018 09:20, Pali Rohár wrote: Did you try already 1. merge the current master to master-kf5 and finish all the porting stuff If you by "merge" means only git merge without git push, then this operation does nothing. Of course you have to push after the merge. But you can try to do

Re: Rebase of kopete branch and push it to master

On Tue, Jan 16, 2018 at 9:24 PM, Ivan Čukić wrote: > Hi all, Hi Ivan (and others), > > Would it be possible for sysadmins to just rename master -> > master-kde4, and master-kf5 -> master? If master were merged into frameworks we could of course do such a rename without too

Re: Rebase of kopete branch and push it to master

On Tuesday 16 January 2018 09:24:56 Ivan Čukić wrote: > Would it be possible for sysadmins to just rename master -> > master-kde4, and master-kf5 -> master? I do not understand you. See my email in first post. master-kf5 is in my cloned repository, not in main one. So I do not understand how such

Re: Rebase of kopete branch and push it to master

Hi all, Would it be possible for sysadmins to just rename master -> master-kde4, and master-kf5 -> master? Cheers, Ivan On Tue, Jan 16, 2018 at 9:20 AM, Pali Rohár wrote: > On Tuesday 16 January 2018 09:05:41 Alexander Semke wrote: >> >> On 16.01.2018 00:45, Pali Rohár

Re: Rebase of kopete branch and push it to master

On Tuesday 16 January 2018 09:05:41 Alexander Semke wrote: > > On 16.01.2018 00:45, Pali Rohár wrote: > > Because it does not work. > > > > remote: Push declined - excessive notifications would be sent > > remote: Please file a KDE Sysadmin bug to continue > > > > Therefore I opened sysadmin

Re: Rebase of kopete branch and push it to master

On 16.01.2018 00:45, Pali Rohár wrote: Because it does not work. remote: Push declined - excessive notifications would be sent remote: Please file a KDE Sysadmin bug to continue Therefore I opened sysadmin ticket T7642 and I was told that I should discuss about it on kde-core-devel. If I

Re: Rebase of kopete branch and push it to master

On Tuesday 16 January 2018 00:32:44 Albert Astals Cid wrote: > El dimarts, 16 de gener de 2018, a les 0:09:50 CET, Pali Rohár va escriure: > > On Tuesday 16 January 2018 00:06:29 Albert Astals Cid wrote: > > > So is the problem: > > > a) that you could not push that master-kf5 to master > > > >

Re: Rebase of kopete branch and push it to master

El dimarts, 16 de gener de 2018, a les 0:09:50 CET, Pali Rohár va escriure: > On Tuesday 16 January 2018 00:06:29 Albert Astals Cid wrote: > > So is the problem: > > a) that you could not push that master-kf5 to master > > Problem is really a). Why is that? You said master-kf5 is just a rebase

Re: Rebase of kopete branch and push it to master

Pali Rohár ha scritto: > On Tuesday 16 January 2018 00:06:29 Albert Astals Cid wrote: >> So is the problem: >> a) that you could not push that master-kf5 to master > > Problem is really a). > a) can't be changed. You can merge your rebased kf5 branch to master. I would still complain, because

Re: Rebase of kopete branch and push it to master

On Tuesday 16 January 2018 00:06:29 Albert Astals Cid wrote: > So is the problem: > a) that you could not push that master-kf5 to master Problem is really a). -- Pali Rohár pali.ro...@gmail.com

Re: Rebase of kopete branch and push it to master

El dilluns, 15 de gener de 2018, a les 9:50:11 CET, Pali Rohár va escriure: > On Sunday 14 January 2018 23:59:45 Albert Astals Cid wrote: > > El diumenge, 14 de gener de 2018, a les 21:52:29 CET, Pali Rohár va escriure: > > > Hi! > > > > Hello Mr Rohár > > > > > From the following ticket

Re: Rebase of kopete branch and push it to master

On Sunday 14 January 2018 23:59:45 Albert Astals Cid wrote: > El diumenge, 14 de gener de 2018, a les 21:52:29 CET, Pali Rohár va escriure: > > Hi! > > Hello Mr Rohár > > > > > From the following ticket https://phabricator.kde.org/T7642 I was > > suggested to open discussion on kde-core-devel

Re: Rebase of kopete branch and push it to master

El diumenge, 14 de gener de 2018, a les 21:52:29 CET, Pali Rohár va escriure: > Hi! Hello Mr Rohár > > From the following ticket https://phabricator.kde.org/T7642 I was > suggested to open discussion on kde-core-devel list. Sending this email > also to kopete-devel as it is relevant for Kopete

Rebase of kopete branch and push it to master

Hi! From the following ticket https://phabricator.kde.org/T7642 I was suggested to open discussion on kde-core-devel list. Sending this email also to kopete-devel as it is relevant for Kopete development. Currently in Kopete git repository https://cgit.kde.org/kopete.git/ is a branch kf5 which