mogenerator update [ticket 53019] review request

2016-12-21 Thread Steven Tondeur
Dear, (Note: This mail was sent through my personal e-mail address instead of my work one (steven.tond...@dentsplysirona.com) because our corporate mail server is badly configured (SPF Fail), something I will not be able to change) On December 6th I provided a ticket with path to update the ‘mo

Re: mogenerator update [ticket 53019] review request

2016-12-21 Thread Aljaž 'g5pw' Srebrnič
Thanks for the heads-up, commited in a8560584ef. On 21 dicembre 2016 at 09:28:58, Steven Tondeur (steventond...@gmail.com) wrote: The ticket has been assigned on the same day (hurray!); no further communication since then. Can you review/commit the patch included in the ticket? signature.asc

Unintentional double commits

2016-12-21 Thread Andrea D'Amore
While trying to push a small change (shell/xonsh) I managed to rebase AND merge the about 300 commits since my previous update, as a results those 300 commits in master now are "duplicated". The files in master are unaltered, except for the actual portfile I was pushing, but the history is now mes

Re: Unintentional double commits

2016-12-21 Thread Rainer Müller
On 2016-12-21 11:41, Andrea D'Amore wrote: > While trying to push a small change (shell/xonsh) I managed to rebase > AND merge the about 300 commits since my previous update, > as a results those 300 commits in master now are "duplicated". > > The files in master are unaltered, except for the actu

Re: Build Failure: cctools, libmacho, libmacho-headers

2016-12-21 Thread Rainer Müller
On 2016-12-21 04:20, Jeremy Huddleston Sequoia wrote: > Can we please configure base on these older builders to use MacPorts' > libcurl+libressl/newer OpenSSL (or just a special one we can install to > /opt/curl) instead of the host's version? More and more source mirrors are > dropping support

Re: SSL Issues and PortGroup GitHub

2016-12-21 Thread John Patrick
Found the issue, got send this related issue https://trac.macports.org/ticket/50469. I commented out a line from /opt/local/etc/macports/macports.conf; macportsuser root And it works, no idea why that line is in that file as I don't believe I would have ever put it in their myself. ansible is no

Re: Unintentional double commits

2016-12-21 Thread Mojca Miklavec
On 21 December 2016 at 12:38, Rainer Müller wrote: > On 2016-12-21 11:41, Andrea D'Amore wrote: >> While trying to push a small change (shell/xonsh) I managed to rebase >> AND merge the about 300 commits since my previous update, >> as a results those 300 commits in master now are "duplicated". >>

Re: A new category of ports: purgatory

2016-12-21 Thread Mojca Miklavec
Hi, Here's what the competing system is doing: https://github.com/Homebrew/homebrew-boneyard Citation: This repository contains formulae that were removed from other repositories. Common reasons for retiring formulae to the boneyard include lack of upstream maintenance or problems integratin

Re: Unintentional double commits

2016-12-21 Thread Zero King
I've created a clean branch on my fork. If you want to clean the history, first cancel branch protection in repository's settings, then do git remote add https://github.com/l2dy/macports-ports.git git fetch --all git checkout master git reset --hard l2dy/fix-history git push -f to reset mas

Re: Unintentional double commits

2016-12-21 Thread Rainer Müller
On 2016-12-21 16:39, Mojca Miklavec wrote: > On 21 December 2016 at 12:38, Rainer Müller wrote: >> On 2016-12-21 11:41, Andrea D'Amore wrote: >>> While trying to push a small change (shell/xonsh) I managed to rebase >>> AND merge the about 300 commits since my previous update, >>> as a results thos

Re: Unintentional double commits

2016-12-21 Thread Mojca Miklavec
On 21 December 2016 at 17:33, Rainer Müller wrote: > On 2016-12-21 16:39, Mojca Miklavec wrote: >> On 21 December 2016 at 12:38, Rainer Müller wrote: >>> On 2016-12-21 11:41, Andrea D'Amore wrote: While trying to push a small change (shell/xonsh) I managed to rebase AND merge the about 3

Re: [macports-ports] branch master updated: grass: jump to 7.2RC2 (dubbed 7.1.99.2)

2016-12-21 Thread Ryan Schmidt
> On Dec 21, 2016, at 06:22, Vincent wrote: > > Vincent (Veence) pushed a commit to branch master > in repository macports-ports. > > > https://github.com/macports/macports-ports/commit/6879a39dde564230f06179065fe1afeeed8a8175 > > The following commit(s) were added to refs/heads/master by thi

Re: Unintentional double commits

2016-12-21 Thread Ryan Schmidt
On Dec 21, 2016, at 04:41, Andrea D'Amore wrote: > While trying to push a small change (shell/xonsh) I managed to rebase > AND merge the about 300 commits since my previous update, > as a results those 300 commits in master now are "duplicated". > > The files in master are unaltered, except for

Re: Unintentional double commits

2016-12-21 Thread Mojca Miklavec
On 21 December 2016 at 18:44, Ryan Schmidt wrote: > On Dec 21, 2016, at 04:41, Andrea D'Amore wrote: > >> While trying to push a small change (shell/xonsh) I managed to rebase >> AND merge the about 300 commits since my previous update, >> as a results those 300 commits in master now are "duplicate

Re: Unintentional double commits

2016-12-21 Thread Marko Käning
I agree with Mojca, it looks messy now! We better fix it fast. Someone with admin access to the repo should be able to fix this if we don’t wait too long. I think we should somehow make sure that such merged branches cannot be pushed to the main repo, if rebasing is our policy for all committers

Re: [macports-ports] branch master updated: ocaml-zarith: update to 1.4.1

2016-12-21 Thread Ryan Schmidt
> On Dec 20, 2016, at 20:00, Kurt Hindenburg wrote: > > Kurt Hindenburg (kurthindenburg) pushed a commit to branch master > in repository macports-ports. > > > https://github.com/macports/macports-ports/commit/ae81c668093b56cc220726e69154fa6f73e23f2d > > The following commit(s) were added to

Re: SSL Issues and PortGroup GitHub

2016-12-21 Thread Daniel J. Luke
On Dec 21, 2016, at 8:18 AM, John Patrick wrote: > I commented out a line from /opt/local/etc/macports/macports.conf; > macportsuser root That should never be set that way. > And it works, no idea why that line is in that file as I don't believe > I would have ever put it in their myself. That'

xonsh-devel broken

2016-12-21 Thread Marko Käning
Hi Andrea, I just saw this when running portindex on my El Capitan VM: Failed to parse file shells/xonsh/Portfile with subport 'xonsh-devel': invalid command name "BASHwards-looking” Greets, Marko

Re: xonsh-devel broken

2016-12-21 Thread Daniel J. Luke
On Dec 21, 2016, at 3:47 PM, Marko Käning wrote: > I just saw this when running portindex on my El Capitan VM: > > Failed to parse file shells/xonsh/Portfile with subport 'xonsh-devel': > invalid command name "BASHwards-looking” yep, I just pushed a fix for the missing \ in the descriptio

Re: xonsh-devel broken

2016-12-21 Thread Marko Käning
On 21 Dec 2016, at 21:51 , Daniel J. Luke wrote: > yep, I just pushed a fix for the missing \ in the description in the subport. :) Just wanted to push that fix myself, but you beat me there!

Re: SSL Issues and PortGroup GitHub

2016-12-21 Thread Joshua Root
On 2016-12-22 07:41 , Daniel J. Luke wrote: On Dec 21, 2016, at 8:18 AM, John Patrick wrote: I commented out a line from /opt/local/etc/macports/macports.conf; macportsuser root That should never be set that way. And it works, no idea why that line is in that file as I don't believe I would

Re: Unintentional double commits

2016-12-21 Thread Ivan Larionov
One of the ways to avoid it is to review things you're going to merge. And one of the easiest ways to do it is to open a PR on github where you can clearly see which commits you're going to merge. I was similar errors multiple times when people do `git pull` instead of `git pull --rebase` and it wa

Re: xonsh-devel broken

2016-12-21 Thread Andrea D'Amore
On 21 December 2016 at 21:54, Marko Käning wrote: > On 21 Dec 2016, at 21:51 , Daniel J. Luke wrote: >> yep, I just pushed a fix for the missing \ in the description in the subport. > :) Just wanted to push that fix myself, but you beat me there! Be honest, you guys are just scared of my push-fu

Re: Unintentional double commits

2016-12-21 Thread Mojca Miklavec
On 21 December 2016 at 22:38, Ivan Larionov wrote: > One of the ways to avoid it is to review things you're going to merge. And > one of the easiest ways to do it is to open a PR on github where you can > clearly see which commits you're going to merge. That doesn't necessarily help. The author ca