Creating a patch

Hi,

I've just embarrassed myself by submitting a faulty patch to Zilla.

I have checked out the LJ code, made some changes to userinfo.bml and then wanted to create a patch. Unfortunately, it created a patch between my version and the very newest version in the CVS repository, and thus this patch would undo all changes made in the repository.

How do I do this properly? I need to merge the changes made in CVS into my local userinfo.bml without losing my own changes.

Thanks for any help.