I'd like to supply some fixes we made to HSQL over the time. However, we need to be able to reconcile those changes with whatever you did to HSQL.
This is _impossible_ to do, since all files changed due to your formatting changes. There's no way to find out what changed between 1.43 and 1.60RC2.
Do you have any kind of change history documenting the changes you made?
I can't even just grab the newest sources - I added some testing framework to HSQL that I'd hate to lose. Is there any way to merge stuff back?
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
A history would be hundreds of revisions, and include my changes. I did not simply reformat and comment the 1.43 code before applying changes, but did it as a gradual process of working with the code over a period of months as our product was developed. A diff of the start and end would be no different that diffing the current snapshot against the 1.43 code, so that's not a big help, as you say, every file has changed.
I felt it necessary to standardize the code, and add the Javadoc framework moving forward to aid in other developers picking it up. Coding standards are a good thing... ;-)
If you would like to send me a snapshot of your current source, I'll be happy to extract and integrate the changes. I can then provide that as a diff or patch, which can be submitted against the CVS code we should have available soon.
Mark
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
I'd like to supply some fixes we made to HSQL over the time. However, we need to be able to reconcile those changes with whatever you did to HSQL.
This is _impossible_ to do, since all files changed due to your formatting changes. There's no way to find out what changed between 1.43 and 1.60RC2.
Do you have any kind of change history documenting the changes you made?
I can't even just grab the newest sources - I added some testing framework to HSQL that I'd hate to lose. Is there any way to merge stuff back?
A history would be hundreds of revisions, and include my changes. I did not simply reformat and comment the 1.43 code before applying changes, but did it as a gradual process of working with the code over a period of months as our product was developed. A diff of the start and end would be no different that diffing the current snapshot against the 1.43 code, so that's not a big help, as you say, every file has changed.
I felt it necessary to standardize the code, and add the Javadoc framework moving forward to aid in other developers picking it up. Coding standards are a good thing... ;-)
If you would like to send me a snapshot of your current source, I'll be happy to extract and integrate the changes. I can then provide that as a diff or patch, which can be submitted against the CVS code we should have available soon.
Mark