Rockbox Technical Forums

Rockbox Development => Starting Development and Compiling => Topic started by: Jon_ on August 28, 2006, 12:09:46 PM

Title: Quick Question
Post by: Jon_ on August 28, 2006, 12:09:46 PM
Is there a way to apply the new cvs source code to your old one with out having to do all your patching all over again?
Title: Re: Quick Question
Post by: Llorean on August 28, 2006, 12:15:29 PM
If you use CVS to check it out you can use the CVS update command.
Title: Re: Quick Question
Post by: Jon_ on August 28, 2006, 12:51:56 PM
Thanks Alot
Title: Re: Quick Question
Post by: Rincewind on August 28, 2006, 01:31:44 PM
to get the best results, use this command form the command prompt:

cvs -q -z3 up -dP

If it says "conflicts found", you should open the specified file and try to solve the conflict, it is marked in the file. In most cases that's easy even without knowing programming very well. I get conflicts on english.lang very often, those can be solved by simple c&p.

The Letters have this meaning:
M - modiefied by one of your patches
P - Updated
C - Conflict, dont try to compile it won't work until the conflict is resolved!!
U - New file dowloaded
merging differences... - update on one of your modified files, cvs did the merge. Everything ok

When a patch has an update, you have to remove the old patch first from the source and then apply the new one. So if you want to reapply patches it is often easier to start fresh.
Title: Re: Quick Question
Post by: Mikerman on August 30, 2006, 12:19:42 AM
Thanks.  What do the -q and -z3 do?
Title: Re: Quick Question
Post by: bluebrother on August 30, 2006, 06:41:34 AM
-q tells cvs to run quietly, -z3 tells it to use compression level 3. Using that options is not necessary but may be useful. See the manpage for details.
Title: Re: Quick Question
Post by: Rincewind on August 30, 2006, 12:43:29 PM
-q is useful because it reduces output on the command prompt. It only shows the things cvs did, not every folder it visits.

-z3 is useful if you don't have a fast internet connection (like me  :( )