|
From: | Leo Famulari |
Subject: | Re: [PATCH] gnu: Add slurm. |
Date: | Sat, 13 Feb 2016 15:38:46 -0500 |
User-agent: | Mutt/1.5.24 (2015-08-30) |
On Sat, Feb 13, 2016 at 03:13:37PM -0500, Leo Famulari wrote: > 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! I investigated some more. I used the patch that is upthread of what I am replying to. I applied the patch with `patch -p1 < ...`. I could have used `git am` but I'm not doing it again ;) Everything applied except for Pjotr's attribution in parallel.scm, so I manually copied that into the file. Then, I added all the changes to the index, committed, and used `git format-patch` to create a patch on master. I'll show you: $ git add -u $ git add gnu/packages/patches/slurm-wlm-configure-remove-nonfree-contribs.patch $ git commit -m "patch-test" $ git format-patch -n --thread=shallow master $ git reset --hard HEAD^ # roll back one commit $ git am 0001-patch-test.patch $ echo $? 0 $ diffoscope --html report.html 0001-patch-test.patch 0001-gnu-Add-slurm.patch I've attached report.html and 0001-patch-test.patch for your inspection. I wonder if the version of git is a factor? 2.1.4 vs 2.6.3. Jan was also using 2.1.4, and his patches also failed *only* on the attribution line.
Offset 1, 13 lines modified | Offset 1, 15 lines modified | ||
1 | From·788a22631663d1e4060ebe87b4272c590f138a25·Mon·Sep·17·00:00:00·2001 | 1 | From·ef998204cde384d35b605509be09b25170c28fb8·Mon·Sep·17·00:00:00·2001 |
2 | Message-Id:·<788a22631663d1e4060ebe87b4272c590f138a25.1455395436.git.leo@famulari.name> | 2 | From:·Pjotr·Prins·<pjotr.public01@thebird.nl> |
3 | From:·Leo·Famulari·<leo@famulari.name> | 3 | Date:·Sat,·13·Feb·2016·09:45:30·+0100 |
4 | Date:·Sat,·13·Feb·2016·15:30:30·-0500 | 4 | Subject:·[PATCH]·gnu:·Add·slurm. |
5 | Subject:·[PATCH·1/1]·patch·test | 5 | |
6 | 6 | ||
7 | *·gnu/packages/parallel.scm·(slurm):·New·variable. | ||
8 | *·gnu/packages/patches/slurm-wlm-configure-remove-nonfree-contribs.patch:·New·file. | ||
9 | *·gnu/packages/parallel.scm·(parallel):·Introduce·license·name·space. | ||
7 | --- | 10 | --- |
8 | ·gnu/packages/parallel.scm··························|·67·++++++++++++++++++++-- | 11 | ·gnu/packages/parallel.scm··························|·67·++++++++++++++++++++-- |
9 | ·...urm-wlm-configure-remove-nonfree-contribs.patch·|·43·++++++++++++++ | 12 | ·...urm-wlm-configure-remove-nonfree-contribs.patch·|·43·++++++++++++++ |
10 | ·2·files·changed,·105·insertions(+),·5·deletions(-) | 13 | ·2·files·changed,·105·insertions(+),·5·deletions(-) |
11 | ·create·mode·100644·gnu/packages/patches/slurm-wlm-configure-remove-nonfree-contribs.patch | 14 | ·create·mode·100644·gnu/packages/patches/slurm-wlm-configure-remove-nonfree-contribs.patch |
12 | 15 | ||
13 | diff·--git·a/gnu/packages/parallel.scm·b/gnu/packages/parallel.scm | 16 | diff·--git·a/gnu/packages/parallel.scm·b/gnu/packages/parallel.scm |
Offset 147, 9 lines modified | Offset 149, 9 lines modified | ||
147 | +·» » ·doc/Makefile | 149 | +·» » ·doc/Makefile |
148 | +·» » ·doc/man/Makefile | 150 | +·» » ·doc/man/Makefile |
149 | +·» » ·doc/man/man1/Makefile | 151 | +·» » ·doc/man/man1/Makefile |
150 | +--· | 152 | +--· |
151 | +2.1.4 | 153 | +2.1.4 |
152 | + | 154 | + |
153 | --· | 155 | --· |
154 | 2.6.3 | 156 | 2.1.4 |
155 | 157 |
Offset 1, 1 lines modified | Offset 1, 1 lines modified | ||
1 | utf-8 | 1 | iso-8859-1 |
0001-patch-test.patch
Description: Text Data
[Prev in Thread] | Current Thread | [Next in Thread] |