Date: Tue, 23 Sep 2003 14:06:00 -0500 From: "Jim C. Nasby" <jim@nasby.net> To: Jason Andresen <jandrese@mitre.org> Cc: Dmitry Agafonov <aga@rsm.ru> Subject: Re: About mergemaster (Re: upgrading) Message-ID: <20030923190600.GC72668@nasby.net> In-Reply-To: <3F7080FD.2050505@mitre.org> References: <12829.1064235540@thrush.ravenbrook.com> <3F6F0A0C.1060308@rsm.ru> <20030923143459.GS37152@nasby.net> <20030923092434.U86981@carver.gumbysoft.com> <20030923170509.GA72668@nasby.net> <3F7080FD.2050505@mitre.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Sep 23, 2003 at 01:21:01PM -0400, Jason Andresen wrote: > 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. Ahh, forgot about that. I normally don't drop to single user mode to do updates. A local 'repository' should take care of this. I don't think it'd even need to be a full repository; presumably just keeping a copy of everything from the previous installworld would suffice. -- Jim C. Nasby, Database Consultant jim@nasby.net Member: Triangle Fraternity, Sports Car Club of America Give your computer some brain candy! www.distributed.net Team #1828 Windows: "Where do you want to go today?" Linux: "Where do you want to go tomorrow?" FreeBSD: "Are you guys coming, or what?"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030923190600.GC72668>