Date: Tue, 23 Sep 2003 13:21:01 -0400 From: Jason Andresen <jandrese@mitre.org> To: "Jim C. Nasby" <jim@nasby.net> Cc: Dmitry Agafonov <aga@rsm.ru> Subject: Re: About mergemaster (Re: upgrading) Message-ID: <3F7080FD.2050505@mitre.org> In-Reply-To: <20030923170509.GA72668@nasby.net> References: <12829.1064235540@thrush.ravenbrook.com> <3F6F0A0C.1060308@rsm.ru> <20030923143459.GS37152@nasby.net> <20030923092434.U86981@carver.gumbysoft.com> <20030923170509.GA72668@nasby.net>
next in thread | previous in thread | raw e-mail | index | archive | help
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@mitre.org |\/ | | | / _| Network and Distributed Systems Engineer _| _|___| _| _|_\___| Office: 703-883-7755
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3F7080FD.2050505>