From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
To: Ben Woodcroft <b.woodcroft@uq.edu.au>
Cc: guix-devel <guix-devel@gnu.org>
Subject: Re: [PATCH] 11 little Ruby gems.
Date: Tue, 13 Oct 2015 16:08:32 +0200 [thread overview]
Message-ID: <idjmvvmzwrj.fsf@bimsb-sys02.mdc-berlin.net> (raw)
In-Reply-To: <5614E0F5.2090509@uq.edu.au>
Ben Woodcroft <b.woodcroft@uq.edu.au> writes:
> On 07/10/15 04:25, Thompson, David wrote:
>> In short, yes, your patches are very welcome. Thanks! - Dave
>
> Here ya go then.
These are beautiful! The only thing that’s 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’t been any objections so far I’ll push them soon.
> Can I ask, would it be helpful to alphabetize the packages in ruby.scm,
> at least vaguely? Always adding new packages to the bottom of the file
> causes git merge conflicts I would imagine. Of course, it would be even
> more helpful if guix import put them in the right spot too, but that
> seems harder.
I’m also fighting with merge conflicts somewhat regularly, e.g. when
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’t seem very useful to me.
More could be gained, I suppose, by using a sexp-aware diff algorithm.
~~ Ricardo
next prev parent reply other threads:[~2015-10-13 14:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-16 9:12 [PATCH] 11 little Ruby gems Ricardo Wurmus
2015-09-19 12:54 ` Thompson, David
2015-09-19 20:15 ` Ricardo Wurmus
2015-10-06 14:35 ` Ricardo Wurmus
2015-10-06 14:55 ` Ben Woodcroft
2015-10-06 18:25 ` Thompson, David
2015-10-07 9:08 ` Ben Woodcroft
2015-10-13 14:08 ` Ricardo Wurmus [this message]
2015-10-14 2:27 ` Ben Woodcroft
2015-10-30 16:22 ` Ricardo Wurmus
2015-10-31 10:33 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=idjmvvmzwrj.fsf@bimsb-sys02.mdc-berlin.net \
--to=ricardo.wurmus@mdc-berlin.de \
--cc=b.woodcroft@uq.edu.au \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.