Rockbox Development > Starting Development and Compiling

Repairing failed HUNKs

<< < (2/3) > >>

eK3eKyToPa:
@TheMono Thank you very much, great tutorial.
I get it now , and will have to modify some patches

TheMono:
Glad I could help. All the best with your patching - feel free to contact me if you have any other questions, though I'll only be of limited help, as programming (and indeed Rockbox in general) isn't my specialty...

eK3eKyToPa:
What does these lines mean

--- Code: ---Index: apps/lang/english.lang =================================================================
--- apps/lang/english.lang (revision 14888)
+++ apps/lang/english.lang (working copy)
@@ -11327,4 +11327,20 @@

--- End code ---

What is the difference between the 2 lines 'apps/lang/english.lang' sometimes the second one ends with .orig extension of the file

And what does the lines between the '@@' and '@@' means, how I have to change them if going to sync the patch?

TheMono:
Don't worry about that. Roughly speaking, it's just switching from a specific revision of the source to your own individualised version. Those lines don't really matter much if you are just patching source and building, not developing.

bluebrother:

--- Quote from: eK3eKyToPa on October 23, 2007, 07:50:47 AM ---
--- Code: ---Index: apps/lang/english.lang =================================================================
--- apps/lang/english.lang (revision 14888)
+++ apps/lang/english.lang (working copy)
@@ -11327,4 +11327,20 @@

--- End code ---

What is the difference between the 2 lines 'apps/lang/english.lang' sometimes the second one ends with .orig extension of the file
--- End quote ---
It tells which files diff compared. The filename doesn't tell much, it's just for reference -- and if you diff against svn it includes the revision of the svn you're diffing against. Again, this is just for convenience and gets ignored when applying the patch.

--- Quote ---And what does the lines between the '@@' and '@@' means, how I have to change them if going to sync the patch?
--- End quote ---
They indicate which portion of the source file has to be changed. Basically they contain line numbers and number of changed lines. Still, you shouldn't change those lines -- you should apply the failed hunks manually (you'd need to do that anyway to have enough control) and then generate a diff from the modified file. I.e. you create a diff the same way you do when generating the diff in the first place.

Navigation

[0] Message Index

[#] Next page

[*] Previous page