Developer forums (C::B DEVELOPMENT STRICTLY!) > Development

D Programming Language Support

<< < (4/13) > >>

nocide:
Ok, cool!

I just tried to patch on Kubuntu 9.10 myself, and I'v got the same error.
But this seems to be a known bug by the diff tool, which don't handle the CRNL code correctly.
For future patch I try to make the diff on linux. I just need to patch my workingcopy on linux myself!?!

MortenMacFly:

--- Quote from: nocide on April 01, 2010, 12:52:36 am ---But this seems to be a known bug by the diff tool, which don't handle the CRNL code correctly.

--- End quote ---
I think still the best way to create a working patch is if you use svn from the command line like:
svn diff > d.patch
Execute this command in the root SVN folder (trunk) of Code::Blocks.
Make sure you always do an svn update on trunk before, otherwise you might get other conflicts.

nocide:

--- Quote from: MortenMacFly on April 01, 2010, 07:16:45 am ---svn diff > d.patch
Execute this command in the root SVN folder (trunk) of Code::Blocks.

--- End quote ---

That's what I have tried.
I also tried svn diff --diff-cmd diff > d.patch to use another diff
tool, but I've got similar result
On win32 this patches works ok, but on linux we get the error as bernard mentioned.
Also a dos2unix or gawk '{ sub("\r$", ""); print }' ... does not help.
It's really strange, I can't see any reason for this failure, when I explore the patch-files.

But I hope I can resolve this issue by going the other way around and create the patches on
linux, which hopefully can applied on win32.

MortenMacFly:

--- Quote from: nocide on April 01, 2010, 11:19:08 am ---It's really strange, I can't see any reason for this failure, when I explore the patch-files.

--- End quote ---
Well there is another reason: An incompatible patch application. ;-)

nocide:
Ok, now I have created the patch on linux, and also added the lineendings for windows.
Now it should work on all supported plattforms: (Linux,win32,OSX,freeBSD)

Please report any bugs, specificaly related to the compiler and linker settings.
I am not able to test all compilers on all plattfroms. This would be simply too much work for my sparetime :)

greets
nocide

Navigation

[0] Message Index

[#] Next page

[*] Previous page

Go to full version