At 2:32 PM -0500 2002/10/07, Eddie Bush wrote:
>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?
>
>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!)
It's probably not a good idea to edit the patch file. I would
probably just use CVS to update your local repository to the latest
version. If you're lucky, CVS will merge the repository version with
yours, and then when you do diff, it'll really just give you diffs
between the repository and your version.
CVS auto-merging is kind of hit-or-miss, especially if your changes
overlap a region which someone else has changed. Still, ultimately
you're best off coming up with a local copy that adds/integrates your
changes with the head revision in CVS and then running diff against
that version...
Joe
--
--
* Joe Germuska { [EMAIL PROTECTED] }
"It's pitiful, sometimes, if they've got it bad. Their eyes get
glazed, they go white, their hands tremble.... As I watch them I
often feel that a dope peddler is a gentleman compared with the man
who sells records."
--Sam Goody, 1956
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
