unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Leo Famulari <leo@famulari.name>
To: Andreas Enge <andreas@enge.fr>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH] gnu: Add slurm.
Date: Sat, 13 Feb 2016 15:13:37 -0500	[thread overview]
Message-ID: <20160213201337.GA9218@jasmine> (raw)
In-Reply-To: <20160213172001.GA3956@debian>

On Sat, Feb 13, 2016 at 06:20:01PM +0100, Andreas Enge wrote:
> On Sat, Feb 13, 2016 at 06:01:19PM +0100, Pjotr Prins wrote:
> > cat 0001-gnu-Add-slurm.patch |patch -p1  # same patch, different name
> > patching file gnu/packages/parallel.scm
> > patching file gnu/packages/patches/slurm-wlm-configure-remove-nonfree-contribs.patch
> > Works fine. Maybe because I used an attachment previously?
> 
> No, that should not be a problem (after I removed the first line ">From..."
> of the attachment). I still get:
> 
> patching file gnu/packages/parallel.scm
> Hunk #1 FAILED at 2.
> 1 out of 3 hunks FAILED -- saving rejects to file gnu/packages/parallel.scm.rej
> patching file gnu/packages/patches/slurm-wlm-configure-remove-nonfree-contribs.patch
> 
> The thing that does not work is adding your copyright line. Very strange;
> we seem to have the same white-space in the file.

I had the same issue with some of Jan's patches yesterday.

I used diffoscope to compare the non-working patch and a "should-be"
identical patch that I generated locally. The only differences were in
the patch headers and the encoding of the file (UTF-8 vs ISO-8859-1).

I couldn't figure out why these differences would matter and moved on,
but it's disturbing that others are hitting the same issue!

  reply	other threads:[~2016-02-13 20:13 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-10 17:36 [PATCH] gnu: Add slurm-llnl Pjotr Prins
2016-02-11  4:04 ` Eric Bavier
2016-02-11  8:15   ` Pjotr Prins
2016-02-11 10:08     ` Andreas Enge
2016-02-11 11:11       ` Pjotr Prins
2016-02-11 14:21         ` Andreas Enge
2016-02-11 15:00           ` Pjotr Prins
2016-02-12 12:30             ` Pjotr Prins
2016-02-11 15:19         ` Eric Bavier
2016-02-12 12:20     ` Pjotr Prins
2016-02-12 12:30       ` Andreas Enge
2016-02-12 12:31         ` Pjotr Prins
2016-02-12 12:57           ` [PATCH] gnu: Add slurm-wlm Pjotr Prins
2016-02-12 17:51             ` Andreas Enge
2016-02-13  8:59             ` [PATCH] gnu: Add slurm Pjotr Prins
2016-02-13 10:28               ` Andreas Enge
2016-02-13 16:42                 ` Pjotr Prins
2016-02-13 17:00                   ` Andreas Enge
2016-02-13 17:01                   ` Pjotr Prins
2016-02-13 17:20                     ` Andreas Enge
2016-02-13 20:13                       ` Leo Famulari [this message]
2016-02-13 20:34                         ` Andreas Enge
2016-02-13 20:40                           ` Leo Famulari
2016-02-14 14:22                             ` Andreas Enge
2016-02-14 19:08                               ` Leo Famulari
2016-02-15 12:09                                 ` Pjotr Prins
2016-02-15 21:51                                   ` Andreas Enge
2016-02-16  7:21                                     ` Pjotr Prins
2016-02-16  9:55                                       ` Andreas Enge
2016-02-13 20:38                         ` Leo Famulari
2016-02-13 21:32                           ` Pjotr Prins
2016-02-13 21:43                             ` Leo Famulari
2016-02-13 17:13                 ` Pjotr Prins
2016-02-11  4:33 ` [PATCH] gnu: Add slurm-llnl Eric Bavier
2016-02-11  8:17   ` Pjotr Prins
2016-02-11  8:28     ` Ricardo Wurmus
2016-02-11 18:36 ` Efraim Flashner
  -- strict thread matches above, loose matches on Subject: below --
2016-02-13 17:22 [PATCH] gnu: Add slurm Pjotr Prins
2016-02-13 17:30 ` Andreas Enge
2016-02-13 17:21 Pjotr Prins
2016-02-13 17:21 Pjotr Prins
2016-02-13 17:18 Pjotr Prins
2016-02-13 17:14 Pjotr Prins
2015-12-28 22:00 swedebugia
2015-12-28 23:13 ` Eric Bavier
2015-12-29  4:31 ` Leo Famulari

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

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160213201337.GA9218@jasmine \
    --to=leo@famulari.name \
    --cc=andreas@enge.fr \
    --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 public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).