Jade's weblog

Process *.rej files [wiki.gnuarch.org]

This is useful for Arch and CVS. Explains how to process .rej files with emacs.

01:57 PM, 18 Nov 2004 by Jade Rubick Permalink | Comments (0)

Another way to track separate trees on CVS

If you're not as good at CVS as you should be, you end up doing things like this..

I've developed project-manager, and at work, we have a lot of customizations for it. I want to keep these separate from the pure version, which I'm releasing for OpenACS. However, I want to work off of my customized verison, and move those changes over the the pure version.

If I was using Arch, this would be fairly easy. If I was really good at CVS, this might also be really easy (although everyone tells me CVS doesn't handle this very well). I believe you'd use vendor branches.

But a easy to understand way to do it is to do development off on my customized version, and do

cvs diff -Nu > patchfile

and then in my release version

patch -p0 < patchfile

That seems to work fine so far for me.

01:28 PM, 29 Apr 2004 by Jade Rubick Permalink | Comments (0)

XML