Re: Fwd: [PEAR] Some tweaks to DB_DataObject

pear@electroteque.org wrote:

fixed that your diff would removed. b) try and make one change at a time, and make a diff for it.

Sorry please dont tell me to RTFM, i am not good with diffing or merging, thanks for showing me how to diff from cvs, but how to i merge into my current version ? I use eclipse, it has some merge features ?

basically the idea here is that you take the changes from your current diff. and then apply the changes to make each single feature/change you have separately to the current CVS version. You then safe the new diff in a separate file for each single feature/change. This will enable Alan to quickly go through your diffs so that he can look on a case by case basis at the implications of the diff to decide if it should be included or not. The problem is that you keep adding new changes at a fast rate that is hard to follow. As in was this change necessary for this or for that feature? I know this is going to be alot of work for you now. But its really a good habit to learn and is the only manageable way for people to look at your changes that only you know intimately. regards, Lukas