Sign in Join

Live chat for Free Pascal, Lazarus, Delphi and every Pascal programmer.

Mailing lists / lazarus / 2002-09

Using nightly diffs in windows NT

4 messages · 2 people ·

Reply by email Subscribe to this list Your subscription

Read-only archive. Use j and k to move between messages.

Hart, Jamie

Hi,

I'm trying to update my version of lazarus using the nightly diff file but am having some difficulty.

Now I must admit that this is all new to me so it may be my own fault.

I downloaded the base version 14/6/2002 and the diff from the website. I then downloaded the windows version 2.54 of the GNU patch utility.

I uncompressed lazarus to C:\LAZARUS the uncompressed the Diff file "LAZARUS_2002-06-14_2002-09-11.DIFF" into the same directory. Also to make things easy I copied PATCH.EXE into that directory.

after checking the help "patch --help" I ran with the command line:

Patch --batch -p2 < LAZARUS_2002-06-14_2002-09-11.DIFF

All was going well until I got this:

patching file components/synedit/synedithighlighter.pp Hunk #2 #3 succeeded at 660 (offset 1 line).
Hunk #5 succeeded at 841 (offset 1 line).
Hunk #7 succeeded at 983 (offset 1 line).
1 out of 7 hunks FAILED -- saving rejects to file
components/synedit/synedithighlighter.pp.rej
patching file components/synedit/synhighlightercpp.pp patching file components/synedit/synhighlighterhtml.pp patching file components/synedit/synhighlighterlfm.pas Hunk #2 #3 succeeded at 123 (offset 1 line).
1 out of 4 hunks FAILED -- saving rejects to file
components/synedit/synhighlighterlfm.pas.rej
patching file components/synedit/synhighlighterpas.pp Assertion failed: hunk, file patch.c, line 343

At which point it bombs out, I'm lost as to why it's doing this. so could anyone who's used the diff under windows give me some pointers as to what's wrong?

Thanks for your time.

Jamie Hart

"The theoreticians have proven that this is unsolvable, but there's three of us, and we're smart..." Dr Arthur Norman (Cambridge University)

Reply by email

Hart, Jamie

-----Original Message-----

Earlier message 18 lines
From: Andrew Johnson Sent: 12 September 2002 02:37 To: Subject: Re: [lazarus] Using nightly diffs in windows NT >trying it your way I get similar errors.. so definately lose the --batch, >and switch to -p0 Agree --batch is not necessary, but if I use -p0 it only patches those files in the main directory. It can't find files in subdirectories. I assume this is because the path used in the patch file is \projects\lazarus\???? whereas I'm using it in \lazarus\???? What directory do you have lazarus in? Jamie

Reply by email

Hart, Jamie

Ok, latest attemmpt:

Extracted lazarus to D:\FPC\PROJECTS\LAZARUS

Placed LAZARUS_2002-06-14_2002-09-11.DIFF in D:\FPC along with patch.exe

Ran the command PATCH -p0 < LAZARUS_2002-06-14_2002-09-11.DIFF

Got the same errors

Hunk #2 #3 succeeded at 660 (offset 1 line).
Hunk #5 succeeded at 841 (offset 1 line).
Hunk #7 succeeded at 983 (offset 1 line).
1 out of 7 hunks FAILED -- saving rejects to file
projects/lazarus/components/synedit/synedithighlighter.pp.rej patching file projects/lazarus/components/synedit/synhighlightercpp.pp patching file projects/lazarus/components/synedit/synhighlighterhtml.pp patching file projects/lazarus/components/synedit/synhighlighterlfm.pas Hunk #2 #3 succeeded at 123 (offset 1 line).
1 out of 4 hunks FAILED -- saving rejects to file
projects/lazarus/components/synedit/synhighlighterlfm.pas.rej patching file projects/lazarus/components/synedit/synhighlighterpas.pp Assertion failed: hunk, file patch.c, line 343

I'm beginning to think it may be the version of patch I'm using, but I'm open to any other suggestions.

If anyone knows the version of patch I should be using please let me know or if possible email the file to me.

thanks

Jamie

Reply by email

Andrew Johnson
Jamie" wrote
I downloaded the base version 14/6/2002 and the diff [...] Patch --batch -p2 < LAZARUS_2002-06-14_2002-09-11.DIFF

well first, you should only have to do a

patch -p0 < LAZARUS_2002-06-14_2002-09-11.DIFF

Hunk #2 FAILED at 39. Hunk #2 FAILED at 53. 1 out of 4 hunks FAILED -- saving rejects to file Assertion failed: hunk, file patch.c, line 343

trying it your way I get similar errors.. so definately lose the --batch, and switch to -p0

Andrew

_________________________________________________________________ MSN Photos is the easiest way to share and print your photos: http://photos.msn.com/support/worldwide.aspx

Reply by email