Re: New mergemaster behavior - comparing CVS $Id too

2000-11-07 Thread Peter Pentchev
On Tue, Nov 07, 2000 at 12:15:14AM -0800, Doug Barton wrote: Peter Pentchev wrote: Is there a way to make mergemaster revert to its old behavior - only comparing $FreeBSD tags on files which have those? Of course there is a way, the question is how likely it is to happen. :)

New mergemaster behavior - comparing CVS $Id too

2000-11-06 Thread Peter Pentchev
Is there a way to make mergemaster revert to its old behavior - only comparing $FreeBSD tags on files which have those? I keep some of my /etc files in a CVS repository of my own, and in the last mergemaster runs it detects that the file in /etc has an $Id, while the file in /var/tmp/temproot