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 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. One last thing. I've been surprised by how rarely I get conflicts when updating. -Eric -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
