[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Implications of indexing changes for code that calls Fortran
|
From: |
Olaf Till |
|
Subject: |
Re: Implications of indexing changes for code that calls Fortran |
|
Date: |
Tue, 3 Jan 2017 19:25:28 +0100 |
|
User-agent: |
Mutt/1.5.23 (2014-03-12) |
On Tue, Jan 03, 2017 at 05:14:56PM +0100, Olaf Till wrote:
> ~/devel/octave-forge/mercurial/control$ hg import control-f77-int-patch.txt
> applying control-f77-int-patch.txt
> patching file src/sl_mb05nd.cc
> Hunk #1 FAILED at 27
> Hunk #2 FAILED at 64
> 2 out of 2 hunks FAILED -- saving rejects to file src/sl_mb05nd.cc.rej
> patching file src/sl_tg04bx.cc
> Hunk #1 FAILED at 25
> Hunk #2 FAILED at 33
> Hunk #3 FAILED at 42
> Hunk #4 FAILED at 74
> Hunk #5 FAILED at 85
> 5 out of 5 hunks FAILED -- saving rejects to file src/sl_tg04bx.cc.rej
> abort: patch failed to apply
> ...
> I've seen nothing obvious in the patch responsible for the
> rejection...
Now I've seen that, contrary to (all?) other files, src/sl_mb05nd.cc
and src/sl_tg04bx.cc had DOS line endings.
Converted them to unix, and then your changeset did apply, pushed
it. So all your patches are now applied.
Olaf
--
public key id EAFE0591, e.g. on x-hkp://pool.sks-keyservers.net
signature.asc
Description: Digital signature