Eric Dobbs wrote: > On Wednesday, May 1, 2002, at 06:47 AM, Sam Joseph wrote: > >> Is there some way that I can handle holding on to other changes that >> I've made that haven't been accepted as patches (such as my Criterion >> String parsing routines and making SqlEnum public) without having to >> re-edit all the files? > > > I like using 'patch' to help me maintain my local > modifications. I do this: > cvs diff -u src/java/.../foo.java > ~/torque-Criteria.patch > > Then I can checkout a fresh copy of torque and use this > command to apply my patch to the latest code: > patch -p0 < ~/torque-Criteria.patch
Okay, so I just did this, and when I tried to apply my Criteria patch I got this: bash-2.05a$ patch -p0 < ../Criteria.patch patching file `src/java/org/apache/torque/util/Criteria.java' Hunk #1 FAILED at 92. Hunk #2 succeeded at 159 (offset -42 lines). Hunk #3 succeeded at 1773 (offset -53 lines). Hunk #4 succeeded at 1830 (offset -42 lines). Hunk #5 FAILED at 1916. Hunk #6 succeeded at 1945 (offset -51 lines). Hunk #7 succeeded at 3147 (offset -112 lines). Hunk #8 succeeded at 3227 (offset -51 lines). Hunk #9 FAILED at 3244. Hunk #10 FAILED at 3429. Hunk #11 FAILED at 3461. Hunk #12 FAILED at 3511. Hunk #13 FAILED at 3545. Hunk #14 FAILED at 3570. Hunk #15 FAILED at 3650. Hunk #16 FAILED at 3724. Hunk #17 FAILED at 3752. Hunk #18 FAILED at 3770. Hunk #19 FAILED at 3801. 13 out of 19 hunks FAILED -- saving rejects to src/java/org/apache/torque/util/Criteria.java.rej bash-2.05a$ Does this mean I now have to go through and add these rejections by hand? If so that seems really tedious :-( > > In the specific case of your Criterion parsing, I think > you could also move that into a separate utility class > and not have to worry about problems merging. Have moved that to a separate class (CriterionParser extends Criteria) - would you be interested in having that in the project for people to use generally? CHEERS> SAM -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
