[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kopete-devel
Subject:    Re: Rebase of kopete branch and push it to master
From:       Ben Cooksley <bcooksley () kde ! org>
Date:       2018-01-16 8:33:50
Message-ID: CA+XidOH6jvfy4h4L_52SurTpsQ0qVDcR2t9zv=gBYRyH=OASJg () mail ! gmail ! com
[Download RAW message or body]

On Tue, Jan 16, 2018 at 9:24 PM, Ivan =C4=8Cuki=C4=87 <ivan.cukic@kde.org> =
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 much fuss. The problem here is that Pali wants to
throw away the current frameworks branch and bring in the commits
which made it up, newly rebased on top of master, with the commits
which were reworked eliminated (ie. a 'pure' history).

The number of commits which get rebased as part of this, is naturally,
greater than 100 and was hence blocked by the server. This is not a
failure, it is the system operating as designed, and there are
numerous reasons why it is setup to do this.

>
> Cheers,
> Ivan

Cheers,
Ben

>
>
> On Tue, Jan 16, 2018 at 9:20 AM, Pali Roh=C3=A1r <pali.rohar@gmail.com> w=
rote:
>> On Tuesday 16 January 2018 09:05:41 Alexander Semke wrote:
>>>
>>> On 16.01.2018 00:45, Pali Roh=C3=A1r 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 remember it correctly, we had this problem last year in LabPlot wh=
en we
>>> decided to bring frameworks into master, too.
>>> We then merged frameworks into master (no rebase) and pushed this merge=
 to
>>> remote. I think the history is still there in the sense
>>> that I can see all those "KDE4Libs->KF5" changes done in the frameworks
>>> branch when bringing master into frameworks, etc.
>>>
>>> Did you try already
>>> 1. merge the current master to master-kf5 and finish all the porting st=
uff
>>
>> If you by "merge" means only git merge without git push, then this
>> operation does nothing. Commit on top of master branch is also ancestor
>> accessible from master-kf5.
>>
>>> 2. merge master-kf5 back into master
>>
>> See above, it does nothing. And git push (after git merge) is failing.
>>
>>> 3. check the history in master
>>
>> --
>> Pali Roh=C3=A1r
>> pali.rohar@gmail.com
>
>
>
> --
> KDE, ivan.cukic@kde.org, http://cukic.co/
> gpg key fingerprint: 292F 9B5C 5A1B 2A2F 9CF3  45DF C9C5 77AF 0A37 240A
[prev in list] [next in list] [prev in thread] [next in thread]