> -----Original Message-----
> From: Eddie Bush [mailto:[EMAIL PROTECTED]]
> Sent: Monday, October 07, 2002 12:32 PM
> To: Struts Developers List
> Subject: Selective diff?
> 
> 
> Problem:
> 
> I've got a pending patch on RequestUtils already for 
> selectApplication. 
>  I also made another modification (added getApplicationPrefix 
> to return 
> the current module prefix) to RequestUtils while bringing the 
> validator 
> into 1.1-compliance.  This means I have two different bugs I need to 
> pick certain changes out for selectively.
> 
> Question:
> 
> Is there a way I can tell cvs diff -u to give me just a 
> certain section 
> as a patch - or is it possible for me to modify the patch to 
> exclude the 
> already posted patch for selectApplication?

I don't believe there's an option to 'cvs -diff' part of a file. It's
possible that 'patch' has an option to only apply part of it, but I don't
have cygwin installed here, so I can't check that.

It's possible that you might be able to modify the patch file, but I've
never tried it myself. You'd need to try it and verify that 'patch' does the
right thing before you submit the patches.

> 
> Not being 110% familiar with how the diff does it's thing 
> (and noticing 
> there is apparantly some config up top telling it where to apply the 
> patch), I'm reluctant to believe it's a simple matter of editing the 
> patch file.  Should I then have a seperate CVS tree for each patch - 
> which only contains changes relevant to a given bug?  (Man - that's a 
> nasty solution, but it's the best one I can come up with!  That's 
> certainly a lot of work just to keep changes seperate!)

Yah, that might be the safest approach, ugly as it is.

--
Martin Cooper


> 
> -- 
> Eddie Bush
> 
> 
> 
> 
> --
> To unsubscribe, e-mail:   
> <mailto:[EMAIL PROTECTED]>
> For additional commands, e-mail: 
> <mailto:[EMAIL PROTECTED]>
> 
> 


--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to