I have a CVS question. Normally I wouldn't bother the nice folks here
with it, but since it involves backmigrating the local changes Timing
Solutions has made to FreeBSD, I thought that others might find its
answer useful in the future.
We have a CVS repo that we import the FreeBSD sources into from time
to time. All FreeBSD sources are kept on a repo branch. This is a
big pita because files come and go in FreeBSD all the time, but we
have that problem licked. What we don't have licked is the ability to
generate diffs easily. One would think that a simple
cvs diff -u -rFREEBSD -rHEAD
would do the trick. However, it comes up with lots and lots and lots
of output because the deleted files somehow still exist on the FREEBSD
vendor branch.
Some of the changes that we've made won't be merged into FreeBSD as
they are rather hackish in nature (an option to make ppb use fast
interrupts so that pps has less noise in its measurements is one
example). Most of them will. As they migrate back into FreeBSD, we
also need to put them back on the vendor branch, which I've done in
the past by doing an import and changing the branch rev from 1 to
1.1.1 with cvs admin, so that's covered.
Other than using perforce, can anybody recomment a good way to manage
this situation?
Warner
To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-hackers" in the body of the message
