From owner-freebsd-hackers Mon Sep 18 15:31:36 2000 Delivered-To: freebsd-hackers@freebsd.org Received: from mail.inka.de (quechua.inka.de [212.227.14.2]) by hub.freebsd.org (Postfix) with ESMTP id 369CF37B423 for ; Mon, 18 Sep 2000 15:31:34 -0700 (PDT) Received: from ganerc.mips.inka.de (uucp@) by mail.inka.de with local-bsmtp id 13b9Rl-0002jj-00; Tue, 19 Sep 2000 00:31:33 +0200 Received: (from daemon@localhost) by ganerc.mips.inka.de (8.11.0/8.11.0) id e8ILrX856991 for freebsd-hackers@freebsd.org; Mon, 18 Sep 2000 23:53:33 +0200 (CEST) (envelope-from daemon) From: naddy@mips.inka.de (Christian Weisgerber) Subject: Re: mergemaster RFC (long) Date: 18 Sep 2000 23:53:33 +0200 Message-ID: <8q62st$1nkh$1@ganerc.mips.inka.de> References: <200009171001.e8HA1Mm54441@hak.lan.Awfulhak.org> To: freebsd-hackers@freebsd.org Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Brian Somers wrote: > > First, the things I am definitely going to do. Christian "naddy" > > Weisgerber has taken on the task of porting mm to openbsd. > > I think it would be nice to aim to keep the two scripts exactly the > same, using `uname` when it's really necessary. If I have interpreted the noises Theo has made correctly, he wants mergemaster in the base tree. I don't think he'll keep a "case `uname` ..." in there. Most of the diff deals with two simple differences: - mergemaster uses "read -p " throughout. That fails for OpenBSD's /bin/sh (pdksh), where "read -p" means something entirely different. - On OpenBSD, "install" is synonymous to "install -c". FreeBSD still has the old behavior where plain "install" deletes the source file. If we can get rid of those, the actual differences become more visible. Oh, and changing every instance of "FreeBSD" into "${OPSYS}" or some such would remove another few diff lines. > I think having > > IGNOREFILES="a b c" > > isn't necessary when it's as easy to have > > rm a b c > > in your start script. It seems like overkill to handle ignored files > specifically. Well, I don't know. Something like "IGNOREFILES=..." was the first thing to come to my mind. -- Christian "naddy" Weisgerber naddy@mips.inka.de To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message