From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: Re: [PATCH] 11 little Ruby gems. Date: Tue, 13 Oct 2015 16:08:32 +0200 Message-ID: References: <5613E0C7.1020607@uq.edu.au> <5614E0F5.2090509@uq.edu.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:47354) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zm0Fz-0008Ls-9t for guix-devel@gnu.org; Tue, 13 Oct 2015 10:08:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zm0Fu-0003EH-Ag for guix-devel@gnu.org; Tue, 13 Oct 2015 10:08:47 -0400 Received: from sinope.bbbm.mdc-berlin.de ([141.80.25.23]:37000) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zm0Fu-0003Dj-06 for guix-devel@gnu.org; Tue, 13 Oct 2015 10:08:42 -0400 In-Reply-To: <5614E0F5.2090509@uq.edu.au> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ben Woodcroft Cc: guix-devel Ben Woodcroft writes: > On 07/10/15 04:25, Thompson, David wrote: >> In short, yes, your patches are very welcome. Thanks! - Dave=20 > > Here ya go then. These are beautiful! The only thing that=E2=80=99s missing is adding an = entry for you to the copyright header at the top of the file. (I can amend your first patch in this series to include this line.) Since there haven=E2=80=99t been any objections so far I=E2=80=99ll push = them soon. > Can I ask, would it be helpful to alphabetize the packages in ruby.scm,= =20 > at least vaguely? Always adding new packages to the bottom of the file=20 > causes git merge conflicts I would imagine. Of course, it would be even= =20 > more helpful if guix import put them in the right spot too, but that=20 > seems harder. I=E2=80=99m also fighting with merge conflicts somewhat regularly, e.g. w= hen editing some heavily edited file like the huge python.scm. I avoid much of the problems by adding my packages somewhere to the middle in alphabetic order. I do not do this when I have patch sequences where the latter depend on the former. Ordering package variables in ruby.scm doesn=E2=80=99t seem very useful t= o me. More could be gained, I suppose, by using a sexp-aware diff algorithm. ~~ Ricardo