[macports-base] branch travis-ci updated (18e31dc -> b13450e)

[Zero King]

On Sat, Mar 10, 2018 at 10:33:55PM -0600, Ryan Schmidt wrote:
>
>On Mar 10, 2018, at 09:52, Zero King wrote:
>
>> Zero King (l2dy) pushed a change to branch travis-ci
>> in repository macports-base.
>>
>> discard 18e31dc  Update bintray deploy key
>>     new b13450e  Update bintray deploy key
>>
>> This update added new revisions after undoing existing revisions.
>> That is to say, some revisions that were in the old version of the
>> branch are not in the new version.  This situation occurs
>> when a user --force pushes a change and generates a repository
>> containing something like this:
>>
>> * -- * -- B -- O -- O -- O   (18e31dc)
>>            \
>>             N -- N -- N   refs/heads/travis-ci (b13450e)
>>
>> You should already have received notification emails for all of the O
>> revisions, and so the following emails describe only the N revisions
>> from the common base, B.
>>
>> Any revisions marked "omit" are not gone; other references still
>> refer to them.  Any revisions marked "discard" are gone forever.
>>
>> The 1 revisions listed above as "new" are entirely new to this
>> repository and will be described in separate emails.  The revisions
>> listed as "add" were already present in the repository and have only
>> been added to this reference.
>>
>>
>> Summary of changes:
>> .travis.yml | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>What do I need to know about this? Was this a force push? I thought we weren't doing those on our main repositories because rewriting public history is bad.

It was a force push. This branch will never be merged to master so I
think it's OK. I was trying to fix deployment issues that turns out to
be Travis CI's fault (https://github.com/travis-ci/travis-ci/issues/9314).

-- 
Best regards,
Zero King
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 3612 bytes
Desc: not available
URL: <http://lists.macports.org/pipermail/macports-dev/attachments/20180311/d9bd6db3/attachment.bin>