Re: [macports-ports] branch master updated (e58232e -> af96137)

2017-01-15 Thread Ryan Schmidt 

> On Jan 12, 2017, at 18:28, Marius Schamschula  wrote:
> 
> Marius Schamschula (Schamschula) pushed a change to branch master
> in repository macports-ports.
> 
>from e58232e  dependents of x265: rebuild with x265 version 2.2
> new d26e175  bro: Update to 2.5
> new 05ec788  fix hashes
> new af96137  remove revision line
> 
> The 3 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:
> net/bro/Portfile | 10 +-
> 1 file changed, 5 insertions(+), 5 deletions(-)
> 

These three changes needed to have been pushed to master as a single 
logically-consistent squashed commit.

Re: [macports-ports] branch master updated (e58232e -> af96137)

2017-01-12 Thread Ryan Schmidt 
I know. And we want the history of our main repository to be reasonable, so 
it's necessary to fix PRs before merging.

> On Jan 12, 2017, at 20:15, Marius Schamschula  wrote:
> 
> This was a merge from a GitHub PR.
> 
>> On Jan 12, 2017, at 8:07 PM, Ryan Schmidt  wrote:
>> 
>> 
>>> On Jan 12, 2017, at 18:28, Marius Schamschula  wrote:
>>> 
>>> Marius Schamschula (Schamschula) pushed a change to branch master
>>> in repository macports-ports.
>>> 
>>>   from e58232e  dependents of x265: rebuild with x265 version 2.2
>>>new d26e175  bro: Update to 2.5
>>>new 05ec788  fix hashes
>>>new af96137  remove revision line
>>> 
>>> The 3 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:
>>> net/bro/Portfile | 10 +-
>>> 1 file changed, 5 insertions(+), 5 deletions(-)
>>> 
>> 
>> This should have been pushed as a single commit.
>> 
>> 
> 
> Marius
> --
> Marius Schamschula
> 
> 
> 
>

Re: [macports-ports] branch master updated (e58232e -> af96137)

2017-01-12 Thread Ryan Schmidt 

> On Jan 12, 2017, at 18:28, Marius Schamschula  wrote:
> 
> Marius Schamschula (Schamschula) pushed a change to branch master
> in repository macports-ports.
> 
>from e58232e  dependents of x265: rebuild with x265 version 2.2
> new d26e175  bro: Update to 2.5
> new 05ec788  fix hashes
> new af96137  remove revision line
> 
> The 3 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:
> net/bro/Portfile | 10 +-
> 1 file changed, 5 insertions(+), 5 deletions(-)
> 

This should have been pushed as a single commit.