From owner-freebsd-stable Tue Jun 26 21:58: 4 2001 Delivered-To: freebsd-stable@freebsd.org Received: from maila.telia.com (maila.telia.com [194.22.194.231]) by hub.freebsd.org (Postfix) with ESMTP id 5C00C37B405 for ; Tue, 26 Jun 2001 21:58:01 -0700 (PDT) (envelope-from ertr1013@student.uu.se) Received: from d1o913.telia.com (d1o913.telia.com [195.252.44.241]) by maila.telia.com (8.11.2/8.11.0) with ESMTP id f5R4w0F16089 for ; Wed, 27 Jun 2001 06:58:00 +0200 (CEST) Received: from ertr1013.student.uu.se (h185n2fls20o913.telia.com [212.181.163.185]) by d1o913.telia.com (8.8.8/8.8.8) with SMTP id GAA09451 for ; Wed, 27 Jun 2001 06:57:59 +0200 (CEST) Received: (qmail 94975 invoked by uid 1001); 27 Jun 2001 04:57:24 -0000 Date: Wed, 27 Jun 2001 06:57:23 +0200 From: Erik Trulsson To: stable@FreeBSD.ORG Subject: Re: Problems with mergemaster Message-ID: <20010627065723.A94912@student.uu.se> Mail-Followup-To: stable@FreeBSD.ORG References: <20010626225556.A3305@nc.rr.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20010626225556.A3305@nc.rr.com> User-Agent: Mutt/1.3.19i Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, Jun 26, 2001 at 10:55:56PM -0400, Randall Hopper wrote: > Garrett Wollman: > |Darren Gamble wrote: > |> > |> I have recently (finally) been able to do a make build/installworld on > |> one of my test systems with the Stable tree. > |> > |> However, mergemaster does not appear to be working properly. ... > |> For each file, I get > |> > |> *** Problem installing ./foo , it will remain to merge by hand > | > |That's because someone(tm) removed the `-c' options to `install' from > |the -stable version of mergemaster, even though the -stable version of > |`install' still needs them. > > Is there a work-around for this? I supped stable Monday and also saw this. > The work-around is to ignore the error messages. Contrary to what the message says the files do get installed correctly. You can verify this by rerunning mergemaster and noticing that it ignores those files the second time (since they have already been updated.) -- Erik Trulsson ertr1013@student.uu.se To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message