About mergemaster (Re: upgrading)

[Jason Andresen]

Jim C. Nasby wrote:

> On Tue, Sep 23, 2003 at 09:25:10AM -0700, Doug White wrote:
> 
>>On Tue, 23 Sep 2003, Jim C. Nasby wrote:
>>
>>
>>>I think a far better solution would be to give mergemaster the ability
>>>to compare files to the version in CVS as reported by the $FreeBSD$ tag.
>>
>>In 99% of cases, there is no CVS repo to compare against.
> 
>  
> Huh? What about the main FBSD CVS repository?

Mergemaster is typically run in single user mode.  Unless you're running 
mergemaster on a CVS mirror, you're not going to be able to get at it.

-- 
   \  |_ _|__ __|_ \ __| Jason Andresen        jandrese at mitre.org
  |\/ |  |    |    / _|  Network and Distributed Systems Engineer
_|  _|___|  _| _|_\___| Office: 703-883-7755