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
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
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!
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
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
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
> 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
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
> 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
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
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
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
12 matches
Mail list logo