Re: mergemaster and $FreeBSD$

2000-11-10 Thread Doug Barton
Archie Cobbs wrote: My machines get their source code from a local CVS mirror of the FreeBSD source tree, which is at /home/cvs/freebsd/src.. we have our own CVSROOT stuff of course. Just so I understand, you don't have a mirror of the freebsd CVS repo itself, you have your own repo

Re: mergemaster and $FreeBSD$

2000-11-09 Thread Christian Weisgerber
Archie Cobbs [EMAIL PROTECTED] wrote: even worse, mergemaster in some cases seems to be comparing only the $FreeBSD$ strings and incorrectly concluding that certain files don't need upgrading, when in fact they do. If the -s switch isn't specified, mergemaster compares id strings first, and

Re: mergemaster and $FreeBSD$

2000-11-09 Thread Tony Finch
Archie Cobbs [EMAIL PROTECTED] wrote: So.. what stuff in /home/cvs/CVSROOT can I change so that sources in freebsd/* get $FreeBSD$ substitution, but other sources get the normal $Id$ substitution? Surely someone has solved this already.. ? If you are using the FreeBSD version of CVS (which has

Re: mergemaster and $FreeBSD$

2000-11-09 Thread Archie Cobbs
Tony Finch writes: So.. what stuff in /home/cvs/CVSROOT can I change so that sources in freebsd/* get $FreeBSD$ substitution, but other sources get the normal $Id$ substitution? Surely someone has solved this already.. ? If you are using the FreeBSD version of CVS (which has been patched to

mergemaster and $FreeBSD$

2000-11-08 Thread Archie Cobbs
My machines get their source code from a local CVS mirror of the FreeBSD source tree, which is at /home/cvs/freebsd/src.. we have our own CVSROOT stuff of course. So when stuff is checked out of the freebsd/* repostitories, the $FreeBSD$ tags don't get substituted correctly. This causes