Rockbox Development > Starting Development and Compiling

How to sync patches?

(1/3) > >>

digerati1338:
Just wondering if anyone could give me or point me to a quick lesson on syncing patches.  I have some experience with code, but don't know exactly what needs to be done to sync a patch.  

Thanks for the help.

cpchan:

--- Quote from: digerati1338 on July 12, 2007, 05:24:18 PM ---Just wondering if anyone could give me or point me to a quick lesson on syncing patches.  I have some experience with code, but don't know exactly what needs to be done to sync a patch.
--- End quote ---

1. Find all the reject files (they have the .rej extension).

2. Look through them and see what is being rejected and at what location.

3. Modified the source code in the corresponding files.

4. Make a unified diff against the pristine source.

Depending on how much the source have changed, you might need to do some coding or a complete rewrite of the patch.

Charles

tdtooke:
Basically what he said, you also want to use -r as well as -u.  I use cygwin and this is how I do it exactly:
diff -u -r name_original_source name_modified_source > name_of_patch.patch
Of course if your patch doesn't have any dependencies you could just do a diff against svn, just make sure there haven't been any new commits before you try it.  I don't recommend that though since there is always a chance somebody just upped a change.

digerati1338:
@cpchan:
1. Ok, I got that.
2. How exactly do I know what is being rejected, and how do i trace and fix the problem?
3. OK
4. Check.

cpchan:

--- Quote from: digerati1338 on July 15, 2007, 09:02:13 PM ---How exactly do I know what is being rejected,
--- End quote ---

It is very obvious in the reject files.


--- Quote ---and how do i trace and fix the problem?
--- End quote ---

read and search through the code in the original files.

Charles

Navigation

[0] Message Index

[#] Next page