I'm in a fustrating situation where I am repeatidly checking code, editing,
synchronizing, finding something is broke, reverting all my changes and starting over. This if often easier than trying to merge my changes with someone who has beat me to the checkin.

Is there a way I can mitigate this with a script? Doing perl search and replace on files helps. I know there are some patch utilties that will generate a patch file that (I think) are part of CVS. The problem is that we are not using CVS or SVN.

Is there an open source utiltity, perhaps a perl module, that will apply the changes I have made to a file again when I have starting over from a fresh checkout? I was hoping for one based on search strings instead of line numbers.

It seems like there should be a way to make emacs save a journal that I can execute again later.

Thanks,
siegfried