[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 17:14:56 +0100 |
|
User-agent: |
Mutt/1.5.23 (2014-03-12) |
On Tue, Jan 03, 2017 at 10:04:01AM -0500, John W. Eaton wrote:
> On 01/03/2017 04:55 AM, Olaf Till wrote:
>
> >The changeset for control did not apply, however.
>
> What hppened? My repo seems to be up to date.
~/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 have
>
> [paths]
> default = http://hg.code.sf.net/p/octave/control
>
> in my control/.hg/hgrc file
and I have the same repository:
[paths]
default = ssh://address@hidden/p/octave/control
> and the tip prior to my changes (so the parent
> of my changeset) is
>
> changeset: 1522:fddd53f19e24
> user: Nir Krakauer <address@hidden>
> date: Sun Jan 01 15:12:30 2017 -0500
> summary: new function dsort (patch #9192)
The same here:
changeset: 1522:fddd53f19e24
tag: tip
user: Nir Krakauer <address@hidden>
date: Sun Jan 01 15:12:30 2017 -0500
summary: new function dsort (patch #9192)
My mercurial version is 3.1.2.
I've seen nothing obvious in the patch responsible for the
rejection...
Mercurial shouldn't checkout different files with http:// and ssh://,
but just in case I'm attaching my src/sl_mb05nd.cc, so you can check
for (whitespace?) differences...
Olaf
--
public key id EAFE0591, e.g. on x-hkp://pool.sks-keyservers.net
sl_mb05nd.cc
Description: Text Data
signature.asc
Description: Digital signature