[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-core-devel
Subject: Re: [Kde-pim] Push access to kdepim and kdepimlibs suspended
From: Till Adam <adam () kde ! org>
Date: 2013-01-23 7:33:55
Message-ID: 5505510.nGzC2U4M9s () till ! local
[Download RAW message or body]
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
[Attachment #3 (unknown)]
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" \
"http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" \
content="1" /><style type="text/css"> p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Monaco'; font-size:10pt; font-weight:400; \
font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">On \
Wednesday 23 January 2013 19:33:30 Ben Cooksley wrote:</p> <p \
style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px; "> </p> <p style=" \
margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> Just a quick notice that \
due to a accidental merge from KDE/4.10 into</p> <p style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;">> master in both the kdepim and kdepimlibs \
repositories, both have been</p> <p style=" margin-top:0px; margin-bottom:0px; \
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; \
-qt-user-state:0;">> locked.</p> <p style=" margin-top:0px; margin-bottom:0px; \
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; \
-qt-user-state:0;">> A force push has already been performed to reverse the \
changes,</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> \
however it has been left locked to ensure that the changes are not</p> <p style=" \
margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> reintroduced \
accidentally (changes are also needed on various</p> <p style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;">> infrastructure systems, which in themselves \
are not capable of</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> \
handling a force push).</p> <p style=" margin-top:0px; margin-bottom:0px; \
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; \
-qt-user-state:0;">> </p> <p style=" margin-top:0px; margin-bottom:0px; \
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; \
-qt-user-state:0;">> Unfortunately, due to the manner in which the change \
occurred, it is</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">> \
difficult to block it reoccurring at this time.</p> <p \
style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; \
margin-right:0px; -qt-block-indent:0; text-indent:0px; "> </p> <p style=" \
margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; -qt-user-state:0;">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 ;).</p> <p style="-qt-paragraph-type:empty; \
margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; "> </p> <p style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; -qt-user-state:0;">Thanks to those who fixed the repos late at \
night, and sorry again.</p> <p style="-qt-paragraph-type:empty; margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; "> </p> <p style=" margin-top:0px; margin-bottom:0px; \
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; \
-qt-user-state:0;">Till</p> <p style="-qt-paragraph-type:empty; margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px; "> </p></body></html>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic