Rockbox Development > Starting Development and Compiling

Repairing failed HUNKs

<< < (3/3)

eK3eKyToPa:

--- Quote from: bluebrother on October 23, 2007, 11:30:12 AM ---... 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.


--- End quote ---


I didn't get how to generate the diff ( is .patch available) file

bluebrother:
if you're working on a svn checkout, simply issue

--- Code: ---svn diff
--- End code ---
This will diff the complete tree. If you only want do diff some specific files just add them as arguments to the command.

Diff and patch are almost identical: diff is the tool for checking the differences between two files. The output is a simple text and usually saved to a file. It's common use to use the file extension .diff or .patch for this output. Patch is the tool to apply the output of diff to a source tree.

And I'd really suggest you reading the documentation for diff / patch. This is simply basic usage of those tools.

Mad Cow:
And remember that just typing svn diff won't output it to a file. You need to type svn diff >filename.diff

eK3eKyToPa:
Ha-ha
Thx

tdtooke:
Bear in mind sometimes things have just moved substantially and then you can use the reject files to find what landmarks you need to be looking for to put things in, but then other times you have to know C and have to be familiar with how whatever it is your working with works.  It can involve endless hours of staring at the code until your eyes are bloodshot before you begin to see how something works.

Navigation

[0] Message Index

[*] Previous page