Re: Archos special build

2006-02-24 Thread Manuel Dejonghe
On 2/24/06, Tom Cole <[EMAIL PROTECTED]> wrote: > My intention is simply to make these files available to those who wish > to use them, and the Rockbox site seems a logical place to host them. The misticriver forums do already host (through post attachments) modified rockbox-firmwares. Maybe that'

Re: Editing .patch files?

2006-02-24 Thread David Bryant
I would suggest (as someone else did) that you do a clean check-out and move the changes that you want for a given patch into the clean code. Because of the complexities you mention, I suspect that it's a lot easier to just edit the changes you want to make in the actual code than in the patch file

Re: Archos special build

2006-02-24 Thread Tom Cole
On Fri, 24 Feb 2006 07:30:12 +0100 (CET), Daniel Stenberg <[EMAIL PROTECTED]> wrote: >On Fri, 24 Feb 2006, Tom Cole wrote: > >> Would the developers mind if I created a wiki page on the Rockbox site and >> hosted my special build there? > >Here's _my_ view of it: > >In general I have no problem w

Re: Editing .patch files?

2006-02-24 Thread Jerry Van Baren
Jerry Van Baren wrote: [snip] This looks interesting, but probably doesn't help you today :-/ http://www.gerv.net/software/patch-maker/ (http://books.mozdev.org/html/mozilla-app-b-sect-2.html) Emacs mode: http://www.linuxgazette.com/issue27/marsden.html vim built in support: vimdiff Graphica

Re: Editing .patch files?

2006-02-24 Thread gl
Thanks for the advice and links guys, I'll report back if I find anything that works well. -- gl - Original Message - From: "Jerry Van Baren" <[EMAIL PROTECTED]> To: "Rockbox development" Sent: Friday, February 24, 2006 5:34 PM Subject: Re: Editing .patch files? gl wrote: Hi, E

Re: Editing .patch files?

2006-02-24 Thread Jerry Van Baren
gl wrote: Hi, Each changed file has an obvious header. If you don't intend to change that file, simply delete the section to the next file header. That part I figured out : ). Within a file, each change section has a flag showing the starting line and number of lines that were removed in

Re: Editing .patch files?

2006-02-24 Thread Martin Arver
I got curious and googled around. I found some potentially useful tools. You might want to have a look at some of those. Both of these are visual patch-tools: http://freshmeat.net/projects/xfdiff/ http://freshmeat.net/projects/patcheditor/ On 2/24/06, Martin Arver <[EMAIL PROTECTED]> wrote: > T

Re: Editing .patch files?

2006-02-24 Thread Manuel Dejonghe
On 2/24/06, gl <[EMAIL PROTECTED]> wrote: > One solution that just ocurred to me is to copy my build folder, strip mods > I don't want included from the source files first, and then diff against > CVS. Is there an easier way though? Hi, right, this is the only way that comes to my mind. One of th

Re: Editing .patch files?

2006-02-24 Thread Martin Arver
That sounds like a good way of doing it. The only other thing I can think of making it easier , is to use a visual cvs tool like Cervisia. But I have no experience with those. I guess Cervisia covers diff as well as the other aspects of CVS. On 2/24/06, gl <[EMAIL PROTECTED]> wrote: > >I am not qu

Re: Editing .patch files?

2006-02-24 Thread gl
Hi, Each changed file has an obvious header. If you don't intend to change that file, simply delete the section to the next file header. That part I figured out : ). Within a file, each change section has a flag showing the starting line and number of lines that were removed in the section

Re: Editing .patch files?

2006-02-24 Thread gl
I am not quite sure if I understand you correctly, but if you want to create a diff for one file against CVS then you do 'cvs diff -u file patch' (snipped from The problem is where several mods are in the same file, and worse if they appear in the same hunk together. You're then not only for

Re: Editing .patch files?

2006-02-24 Thread Jerry Van Baren
gl wrote: OK, I'm new to the world of diff and patch. I've added about 4 features to a CVS build (spread over many files), and want to create a .patch file for just one of them for submission. I can generate a total patch against CVS, but editing it to remove the mods I don't want is trick

Re: Editing .patch files?

2006-02-24 Thread Martin Arver
I am not quite sure if I understand you correctly, but if you want to create a diff for one file against CVS then you do 'cvs diff -u file > patch' (snipped from http://www.rockbox.org/twiki/bin/view/Main/WorkingWithPatches). Although I'm not a veteran in the world of patches and CVS, I've found i

Editing .patch files?

2006-02-24 Thread gl
OK, I'm new to the world of diff and patch. I've added about 4 features to a CVS build (spread over many files), and want to create a .patch file for just one of them for submission. I can generate a total patch against CVS, but editing it to remove the mods I don't want is tricky where fea