Fwd: Could I make a tag for k3b kf5 branch?
Leslie Zhai
xiang.zhai at i-soft.com.cn
Sat Jul 16 08:42:27 UTC 2016
On 2016年07月16日 16:37, Ben Cooksley wrote:
> On Sat, Jul 16, 2016 at 6:14 PM, Leslie Zhai <xiang.zhai at i-soft.com.cn> wrote:
>> Hi Albert,
> Hi Leslie,
>
>> I have reverted libkcddb https://quickgit.kde.org/?p=libkcddb.git
> As reverts of merges are unreliable and often lead to bad results,
> i've done a force push to remove the merge commit and the following
> revert commit.
> I've also blacklisted the merge and revert commits to prevent them
> from being reintroduced into the repository. Attempts to reintroduce
> them will result in an audit failure.
>
> Had the repository been left in this state you would not have been
> able to merge the work back into the branch at a later date (as from
> Git's perspective the commits are already in the branch).
Thank Ben, yes, the repository had been left in the state without my
fault ;-)
>
> @Albert / @Luigi: Everything should be good for the upcoming release /
> for scripty to be re-enabled now.
>
> Regards,
> Ben Cooksley
> KDE Sysadmin
>
>>
>>
>> On 2016年07月16日 07:24, Albert Astals Cid wrote:
>>> El divendres, 15 de juliol de 2016, a les 20:26:19 CEST, Ben Cooksley va
>>> escriure:
>>>> On Fri, Jul 15, 2016 at 8:17 PM, David Faure <faure at kde.org> wrote:
>>>>> On vendredi 15 juillet 2016 16:04:57 CEST Leslie Zhai wrote:
>>>>>> Hi Jeremy,
>>>>>>
>>>>>> i18n-doc mailing list is empty?!
>>>>>> https://mail.kde.org/pipermail/kde-i18n-doc/
>>>>> Archives are not enabled for all mailing-lists on mail.kde.org, for
>>>>> space
>>>>> reasons. lists.kde.org disappeared though, to my surprise.
>>>> Space isn't an issue now - we just don't have archives for many older
>>>> lists.
>>>> This is something i'd like to fix (eventually) - that's a topic for
>>>> another
>>>> list and thread though :)
>>>>
>>>> As for lists.kde.org, it should redirect to marc.info if we don't have
>>>> archives for a list, although this doesn't always work unfortunately.
>>>>
>>>>> So what remains (but very well hidden) is
>>>>>
>>>>> http://kde.markmail.org/search/?q=kde-i18n-doc#query:kde-i18n-doc%20list%3
>>>>> Aorg.kde.kde-i18n-doc+page:1+state:facets>
>>>>>> and I have merged kf5 branch for k3b and libkcddb!
>>>>> Albert: be nice, Leslie asked this list how to proceed and got told to
>>>>> merge to master. If you have better advice to give, please do, that's
>>>>> what this was all about, asking how to proceed.
>>>> To minimize the disruption to the Applications/16.08 release, shall I
>>>> undo this merge?
>>> Yes, the libkcddb one at least, I don't "care" for k3b, will let Leslie
>>> decide
>>> about that.
>>>
>>> Cheers,
>>> Albert
>>>
>>>> (Please don't try to revert a merge, evil creatures will spawn and
>>>> kittens everywhere will die)
>>>>
>>>>> --
>>>>> David Faure, faure at kde.org, http://www.davidfaure.fr
>>>>> Working on KDE Frameworks 5
>>>> Cheers,
>>>> Ben
>>>>
>>>>> _______________________________________________
>>>>> release-team mailing list
>>>>> release-team at kde.org
>>>>> https://mail.kde.org/mailman/listinfo/release-team
>>>> _______________________________________________
>>>> release-team mailing list
>>>> release-team at kde.org
>>>> https://mail.kde.org/mailman/listinfo/release-team
>>>
>> --
>> Regards,
>> Leslie Zhai - https://git.reviewboard.kde.org/users/lesliezhai/
>>
>>
>>
--
Regards,
Leslie Zhai - a KDE developer https://git.reviewboard.kde.org/users/lesliezhai/
More information about the release-team
mailing list