On Wed, 11 Jul 2012, TAY wee-beng wrote: > > I just tried on a different system and the same error occurs. The 1st command > : > / > / > > /patch -Np1 -R < DMDAVecRestoreArrayF90-2.patch > > $ patch -Np1 -R < DMDAVecRestoreArrayF90-2.patch > (Stripping trailing CRs from patch.) > patching file src/dm/impls/da/f90-custom/zda1f90.c > (Stripping trailing CRs from patch.) > patching file src/sys/f90-src/f90_cwrap.c > (Stripping trailing CRs from patch.) > patching file src/sys/f90-src/fsrc/f90_fwrap.F/ > > works but the 2nd one doesn't: > / > $ patch -Np1 < DMDAVecRestoreArrayF90-2.1.patch > (Stripping trailing CRs from patch.) > patching file src/dm/impls/da/f90-custom/zda1f90.c > Hunk #1 FAILED at 175. > 1 out of 1 hunk FAILED -- saving rejects to file > src/dm/impls/da/f90-custom/zda1f90.c.rej > (Stripping trailing CRs from patch.) > patching file src/sys/f90-src/f90_cwrap.c > Hunk #1 FAILED at 307. > Hunk #2 FAILED at 333. > Hunk #3 FAILED at 436. > 3 out of 3 hunks FAILED -- saving rejects to file > src/sys/f90-src/f90_cwrap.c.rej > (Stripping trailing CRs from patch.) > patching file src/sys/f90-src/fsrc/f90_fwrap.F > Hunk #1 FAILED at 322. > Hunk #2 FAILED at 426. > 2 out of 2 hunks FAILED -- saving rejects to file > src/sys/f90-src/fsrc/f90_fwrap.F.rej/ > > > It is possible to send me the 3 patch files? Or is there some other ways?
This doesn't make any sense. What petsc-dev do you have? Is it hg repo? or something else? What revisions? Are the sources locally modified? You can apply DMDAVecRestoreArrayF90-2.patch and then edit src/sys/f90-src/f90_cwrap.c and replace all occurances of 'F90ARRAY4d' with 'F90ARRAY4D' in the editor to get the same effect. Satish
