Viktor Szakáts napsal(a):
s...@siki:~/clipp/harbour/examples/dbu/test_src$ dos2unix *
s...@siki:~/clipp/harbour/examples/dbu/test_src$ patch -N -i dbu52.dif
patching file dbu.prg
Hunk #1 FAILED at 60.
Hunk #2 FAILED at 381.
Hunk #3 FAILED at 398.
3 out of 3 hunks FAILED -- saving rejects to file dbu.prg.rej
patching file dbucopy.prg
Hunk #3 succeeded at 741 (offset 6 lines).
Hunk #4 succeeded at 756 (offset 6 lines).
Hunk #5 succeeded at 819 (offset 6 lines).
Hunk #6 succeeded at 834 (offset 6 lines).
patching file dbuindx.prg
patching file dbustru.prg
patching file dbuutil.prg
patching file dbuview.prg
Hunk #3 succeeded at 2789 (offset -1 lines).
Hunk #4 succeeded at 2798 (offset -1 lines).
Hunk #5 succeeded at 2840 (offset -1 lines).
Hunk #6 succeeded at 3009 (offset -1 lines).
Hunk #7 succeeded at 3080 (offset -1 lines).
Could be the EOL conversion is also wrong, but this last
series of errors are a clear sign that you're trying to
patch 5.3 sources with the 5.2 .dif file.
I never used 5.3, this is 5.2e sources, but maybe are touched/changed
I'm not sure
Please try with dbu53.dif, it should finish successfully.
s...@siki:~/clipp/harbour/examples/dbu$ rm test_src/*
s...@siki:~/clipp/harbour/examples/dbu$ cp test
test.dbf test_src/
s...@siki:~/clipp/harbour/examples/dbu$ cp ori_src/* test_src/
s...@siki:~/clipp/harbour/examples/dbu$ cp dbu5
dbu52.dif dbu53.dif
s...@siki:~/clipp/harbour/examples/dbu$ cp dbu53.dif test_src/
s...@siki:~/clipp/harbour/examples/dbu$
s...@siki:~/clipp/harbour/examples/dbu$ cd test_src/
s...@siki:~/clipp/harbour/examples/dbu/test_src$ ls
dbucopy.prg dbuhelp.prg dbunet.prg dbustru.prg dbuview.prg
dbuedit.prg dbuindx.prg dbu.prg dbuutil.prg dbu53.dif
s...@siki:~/clipp/harbour/examples/dbu/test_src$ dos2unix *.prg
s...@siki:~/clipp/harbour/examples/dbu/test_src$ patch -N -i dbu53.dif
patching file dbu.prg
Hunk #1 FAILED at 9.
Hunk #2 succeeded at 61 with fuzz 2 (offset -10 lines).
Hunk #3 FAILED at 353.
Hunk #4 FAILED at 385.
Hunk #5 FAILED at 402.
Hunk #6 FAILED at 701.
5 out of 6 hunks FAILED -- saving rejects to file dbu.prg.rej
patching file dbucopy.prg
Hunk #3 succeeded at 741 (offset -1 lines).
Hunk #4 succeeded at 756 (offset -1 lines).
Hunk #5 succeeded at 819 (offset -1 lines).
Hunk #6 succeeded at 834 (offset -1 lines).
patching file dbustru.prg
patching file dbuutil.prg
patching file dbuview.prg
s...@siki:~/clipp/harbour/examples/dbu/test_src$
I hope Alexander can check the EOL conversion, maybe
hbformat gets confused on LF line termination on input.
Sorry if this isn't the case, but I cannot verify now.
I take a look
regards
Davor
Brgds,
Viktor
_______________________________________________
Harbour mailing list
[email protected]
http://lists.harbour-project.org/mailman/listinfo/harbour
_______________________________________________
Harbour mailing list
[email protected]
http://lists.harbour-project.org/mailman/listinfo/harbour
