From kde-core-devel Wed Jan 23 07:33:55 2013 From: Till Adam Date: Wed, 23 Jan 2013 07:33:55 +0000 To: kde-core-devel Subject: Re: [Kde-pim] Push access to kdepim and kdepimlibs suspended Message-Id: <5505510.nGzC2U4M9s () till ! local> X-MARC-Message: https://marc.info/?l=kde-core-devel&m=135892654101566 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--nextPart6775333.uPkE3ZDvBZ" This is a multi-part message in MIME format. --nextPart6775333.uPkE3ZDvBZ Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" On Wednesday 23 January 2013 19:33:30 Ben Cooksley wrote: > Just a quick notice that due to a accidental merge from KDE/4.10 into > master in both the kdepim and kdepimlibs repositories, both have been > locked. > A force push has already been performed to reverse the changes, > however it has been left locked to ensure that the changes are not > reintroduced accidentally (changes are also needed on various > infrastructure systems, which in themselves are not capable of > handling a force push). > > Unfortunately, due to the manner in which the change occurred, it is > difficult to block it reoccurring at this time. That was me, it seems, please accept my apologies. I was under the imression that "commit to 4.10, merge 4.10 into master" is the recommended work flow. If I understand correctly the problem was that I committed to a 4.10 that had just been merged so the parent was a merge commit? Several people endorsed my git skill on LinkedIn, so I feel I need to understand what went wrong here ;). Thanks to those who fixed the repos late at night, and sorry again. Till --nextPart6775333.uPkE3ZDvBZ Content-Transfer-Encoding: 7Bit Content-Type: text/html; charset="us-ascii"

On Wednesday 23 January 2013 19:33:30 Ben Cooksley wrote:

 

> Just a quick notice that due to a accidental merge from KDE/4.10 into

> master in both the kdepim and kdepimlibs repositories, both have been

> locked.

> A force push has already been performed to reverse the changes,

> however it has been left locked to ensure that the changes are not

> reintroduced accidentally (changes are also needed on various

> infrastructure systems, which in themselves are not capable of

> handling a force push).

>

> Unfortunately, due to the manner in which the change occurred, it is

> difficult to block it reoccurring at this time.

 

That was me, it seems, please accept my apologies. I was under the imression that "commit to 4.10, merge 4.10 into master" is the recommended work flow. If I understand correctly the problem was that I committed to a 4.10 that had just been merged so the parent was a merge commit? Several people endorsed my git skill on LinkedIn, so I feel I need to understand what went wrong here ;).

 

Thanks to those who fixed the repos late at night, and sorry again.

 

Till

 

--nextPart6775333.uPkE3ZDvBZ--