GIT + CVS workflow query.

Hi there,

I'd like to use GIT to track changes in a CVS repository. As well as tracking changes, I will also need to push patches back to CVS from GIT. My workflow is currently as follows:

  - Use git-cvsimport to import and update a mirror of the CVS
repository; 'project.git'.
 - Pull changes from the mirror to a cloned working copy; 'project'.
 - Fix bugs in the working copy and push commits back to the mirror.
  - Use git-cherry to identify commits in master not currently in the
branch updated by git-cvsimport. Then use git-cvsexportcommit to push
these commits into a CVS checkout.

My question is; as a next step in the workflow, should I be applying the list of commits identified by git-cherry to the branch updated by git-cvsimport? How else does one clear this list so that they do not interfere with the next iteration of the workflow.

I hope I've been clear, and thanks for any suggestions.