Re: [macports-ports] branch master updated: Add myself back as maintainer - I was incorrectly removed in 2007 and just noticed.

2016-12-05 Thread Ryan Schmidt
> On Dec 5, 2016, at 11:00 PM, toby wrote: > > tobypeterson pushed a commit to branch master > in repository macports-ports. > > > https://github.com/macports/macports-ports/commit/b79d2c1ac01df3629781a311219c01e0b3d61bcb > > The following commit(s) were added to refs/heads/master by this pus

Re: PR final steps (to squash or not to squash)

2016-12-05 Thread Lawrence Velázquez
> On Dec 5, 2016, at 7:37 AM, René J.V. Bertin wrote: > > I guess we all have better things to do than this kind of task. Our commit history is essentially communication with future committers about what we did and why. Like any other communication, it should be clear and useful. Much like writ

Re: PR final steps (to squash or not to squash)

2016-12-05 Thread Lawrence Velázquez
> On Dec 5, 2016, at 10:38 AM, René J.V. Bertin wrote: > >> On Monday December 05 2016 14:58:08 Rainer Müller wrote: >> >> What would be easier than just checking out the updated Portfile? You >> can also just download the patch and apply it. Open for suggestions. > > In this case that would pr

Re: PR final steps (to squash or not to squash)

2016-12-05 Thread Lawrence Velázquez
> On Dec 5, 2016, at 8:57 PM, Zero King wrote: > >> From what I understand, what we'd really like for that case is >> a "squash, rebase and merge" option. Unless we've misunderstood what >> "squash and merge" does and it doesn't actually create a merge >> commit? > > No, it doesn't. See https://

Re: PR final steps (to squash or not to squash)

2016-12-05 Thread Lawrence Velázquez
> On Dec 5, 2016, at 5:14 AM, Mojca Miklavec wrote: > > Usually "larryv" is the one who takes most care to split commits Hey now, why the scare quotes? :) vq

Re: PR final steps (to squash or not to squash)

2016-12-05 Thread Zero King
From what I understand, what we'd really like for that case is a "squash, rebase and merge" option. Unless we've misunderstood what "squash and merge" does and it doesn't actually create a merge commit? - Josh No, it doesn't. See https://github.com/blog/2141-squash-your-commits. -- Zero Kin

Re: PR final steps (to squash or not to squash)

2016-12-05 Thread Joshua Root
On 2016-12-6 12:13 , Eric A. Borisch wrote: On Mon, Dec 5, 2016 at 6:56 PM, Joshua Root mailto:j...@macports.org>> wrote: On 2016-12-6 11:49 , Eric A. Borisch wrote: I'm going to throw in my 2c again asking for the 'squash and commit' button to be activated. I'm much more

Re: PR final steps (to squash or not to squash)

2016-12-05 Thread Eric A. Borisch
On Mon, Dec 5, 2016 at 6:56 PM, Joshua Root wrote: > On 2016-12-6 11:49 , Eric A. Borisch wrote: > >> I'm going to throw in my 2c again asking for the 'squash and commit' >> button to be activated. I'm much more likely to wander through and >> commit some cut-and-dried PRs if it is something I ca

Re: PR final steps (to squash or not to squash)

2016-12-05 Thread Joshua Root
On 2016-12-6 11:49 , Eric A. Borisch wrote: I'm going to throw in my 2c again asking for the 'squash and commit' button to be activated. I'm much more likely to wander through and commit some cut-and-dried PRs if it is something I can do drive-by, or even from my phone. And by cut-and-dried, I m

Re: PR final steps (to squash or not to squash)

2016-12-05 Thread Eric A. Borisch
I'm going to throw in my 2c again asking for the 'squash and commit' button to be activated. I'm much more likely to wander through and commit some cut-and-dried PRs if it is something I can do drive-by, or even from my phone. And by cut-and-dried, I mean PRs from a prior contributor updating chec

Re: PR final steps (to squash or not to squash)

2016-12-05 Thread René J . V . Bertin
On Monday December 05 2016 14:58:08 Rainer Müller wrote: > > What would be easier than just checking out the updated Portfile? You > can also just download the patch and apply it. Open for suggestions. In this case that would probably rather be downloading the patch since checking out the portf

tk not building on 10.6.8: #ifdef question in ticket 52090

2016-12-05 Thread Davide Liessi
Dear all, could anyone please have a look at https://trac.macports.org/ticket/52090 ? There's a question about "an appropriate guard for a #ifdef" in order to solve the problem. Thanks, and best wishes! Davide

Re: PR final steps (to squash or not to squash)

2016-12-05 Thread Rainer Müller
On 2016-12-05 13:37, René J.V. Bertin wrote: > Mojca Miklavec wrote on 20161205::11:14:46 re: "Re: PR final steps > (to squash or not to squash)" >> We discussed this quite a bit (I'm not sure where) and the >> conclusion was that: - we want a linear history (

Re: PR final steps (to squash or not to squash)

2016-12-05 Thread René J . V . Bertin
Mojca Miklavec wrote on 20161205::11:14:46 re: "Re: PR final steps (to squash or not to squash)" This was meant to be a public reply, sending again. >We discussed this quite a bit (I'm not sure where) and the conclusion was that: >- we want a linear history (therefore

Re: PR final steps (to squash or not to squash)

2016-12-05 Thread Mojca Miklavec
Hi, On 5 December 2016 at 09:46, René J.V. Bertin wrote: > Hi, > > This has come up on the QtCurve PR and I cannot seem to find an explicit > answer in the wiki (https://trac.macports.org/wiki/WorkingWithGit#pr) > > If a pull request has seen some evolution and thus commits due to the review > p

PR final steps (to squash or not to squash)

2016-12-05 Thread René J . V . Bertin
Hi, This has come up on the QtCurve PR and I cannot seem to find an explicit answer in the wiki (https://trac.macports.org/wiki/WorkingWithGit#pr) If a pull request has seen some evolution and thus commits due to the review process and/or somehow related reasons (for instance, because the proce