On Wed, May 11, 2005 at 08:51:52AM -0400, Mark Merendino wrote:
> > Below is Mark's patch, diff-ified,
>
> Chris, Thanks for doing this.
>
> To all, sorry I have not presented things in the form that is expected.
> I am new to this list and still learning how you would like to see
> patches presented. I will catch on soon. Sorry.
No worries, you did the bulk of the brain work on that. :-)
You probably know this by now, but "diff -ruN mysql++-olddir mysql++-newdir"
is your friend.
I actually use CVS to keep track of all this, which uses less disk space.
Every time a new tarball comes out, I import it on the vendor branch like
this:
cvs -d /home/cvs import -m "Version 1.7.35" software/mysql++ \
mysql++ mysql++-1_7_35
Update HEAD like this:
cd mysql++
cvs update -PdA
cvs update -j HEAD -j mysql++-1_7_35 -Pd
cvs ci -m "merged 1.7.35 into HEAD"
cvs tag mysql++-1_7_35-merged
Then any changes I make can easily be tracked, and diffs can be produced
with rdiff.
vi lib/custom.pl
cvs ci -m "Mark Merendino's equal_list() fix"
cvs tag mysql++-1_7_35-equal_list
cvs rdiff -u -r mysql++-1_7_35 -r mysql++-1_7_35_equal_list \
$(cat CVS/Repository) > equal_list.patch
This may all change when Warren goes to a public subversion repository,
but it works well for me, and I have it all on my local machine.
- Chris
