Re: [Streamsicle-development] One more thing

[Jordan S. <js...@jw...>]

At 06:16 PM 2/24/2003, Matt Hall wrote:
>Haven't had a chance to apply your patches yet Jordan, but I did manage to 
>put them in the patch manager.  Not sure what that thing's good for yet 
>except having a centralized place to look at fixes.
>
>BTW, do you know if the diff file you sent is compatible with the command 
>line patch util?  I couldn't get it to work, but I am no expert.

Alas, I am no expert either. :)  What I did was:
$ cvs diff -upB src/com/streamsicle/util/Utils.java 
web/look_default/streamStatusInc.jsp  web/look_default/main.jsp 
web/look_default/playHistoryInc.jsp web/look_default/requestTreeInc.jsp 
web/look_default/searchreqInc.jsp > ~/stream.diff

and then sent that file ( stream.diff )
As I understand it from 
http://www.cvshome.org/docs/manual/cvs_16.html#SEC130 , the options mean:
`-B' Ignore changes that just insert or delete blank lines.
`-p' Show which C function each change is in.  ( I believe this just makes 
it easier to "eyeball" it.  I am not sure it is useful.)
`-u' Use the unified output format

...

Ah, I just got it to work, thusly:
$ patch -ubp 0 < ~/stream.diff
  patching file `src/com/streamsicle/util/Utils.java'
  patching file `web/look_default/streamStatusInc.jsp'
  patching file `web/look_default/playHistoryInc.jsp'
  patching file `web/look_default/requestTreeInc.jsp'
  patching file `web/look_default/searchreqInc.jsp'

from the root of the streamsicle module.  It applied smoothly to a fresh 
checkout.  The key seemed to be the "-p 0" option, which told it to use the 
full directory as specified in the .diff file (strip 0 from the 
path).  Apparently, the default is to only use the name of the file itself 
(strip all from the path).

I'm not really sure why that's the default, but there is probably some good 
reason. :)

Jordan