[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[netCDF #XXW-396304]: Vectorization patch for NEC SX

I don't know what is going on.

I really thought I had it figured out when I realized that you were working off 
the distribution, not the cvs repository. (They are different in some ways.) 
But no, that is not it either. I make a dist, and then try and apply your 
patch, and get the same errors. 

Could we have different patch programs? That seems unlikely.

In the meantime, how about you send the patched file to me and then we can 
ignore this patch problem and see about adding your patch...

Thanks,
Ed
patch -p0 --verbose < ../../nec_sx_vector_ncx-361-patch 
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: libsrc/ncx.m4
|===================================================================
|--- libsrc/ncx.m4      (.../trunk)     (revision 531)
|+++ libsrc/ncx.m4      (.../branches/nec_sx_vector_ncx)        (revision 531)
--------------------------
Patching file libsrc/ncx.m4 using Plan A...
Hunk #1 succeeded at 1.
Hunk #2 succeeded at 53.
Hunk #3 succeeded at 77.
Hunk #4 succeeded at 93.
Hunk #5 succeeded at 1215 (offset 121 lines).
Hunk #6 succeeded at 1519.
Hunk #7 succeeded at 1956 (offset 121 lines).
Hunk #8 succeeded at 1951.
misordered hunks! output would be garbled
Hunk #9 FAILED at 2107.
Hunk #10 succeeded at 2190 (offset 23 lines).
misordered hunks! output would be garbled
Hunk #11 FAILED at 2256.
Hunk #12 succeeded at 2647 (offset 108 lines).
Hunk #13 succeeded at 2606 (offset 13 lines).
Hunk #14 succeeded at 2760 (offset 108 lines).
Hunk #15 succeeded at 2720 (offset 13 lines).
2 out of 15 hunks FAILED -- saving rejects to file libsrc/ncx.m4.rej
done


Ticket Details
===================
Ticket ID: XXW-396304
Department: Support netCDF
Priority: High
Status: Open