From owner-freebsd-hackers Thu Sep 21 10:44:53 2000 Delivered-To: freebsd-hackers@freebsd.org Received: from genius.systems.pavilion.net (genius.systems.pavilion.net [212.74.1.100]) by hub.freebsd.org (Postfix) with ESMTP id A5E5637B424 for ; Thu, 21 Sep 2000 10:44:50 -0700 (PDT) Received: by genius.systems.pavilion.net (Postfix, from userid 100) id E6C3D9B26; Thu, 21 Sep 2000 18:44:49 +0100 (BST) Date: Thu, 21 Sep 2000 18:44:49 +0100 From: Josef Karthauser To: Brian Somers Cc: Christian Weisgerber , freebsd-hackers@FreeBSD.ORG Subject: Re: mergemaster RFC (long) Message-ID: <20000921184449.K1694@pavilion.net> Mail-Followup-To: Josef Karthauser , Brian Somers , Christian Weisgerber , freebsd-hackers@FreeBSD.ORG References: <8q62st$1nkh$1@ganerc.mips.inka.de> <200009202034.e8KKY3s18401@hak.lan.Awfulhak.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200009202034.e8KKY3s18401@hak.lan.Awfulhak.org>; from brian@Awfulhak.org on Wed, Sep 20, 2000 at 09:34:03PM +0100 X-NCC-RegID: uk.pavilion Organisation: Pavilion Internet plc, Lees House, 21-23 Dyke Road, Brighton, England Phone: +44-845-333-5000 Fax: +44-845-333-5001 Mobile: +44-403-596893 Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Another thing that would be very useful is that during a merge of two files that it's possible to specify both the left hand side and the right hand side. That would fix cases like: Orig: # $FreeBSD: src/etc/shells,v 1.4 SOMEDATE$ # # List of acceptable shells for chpass(1). # Ftpd will not allow users to connect who are not using # one of these shells. /bin/sh /bin/csh /usr/local/bin/zsh The new 1.5 version has: /bin/tcsh in it. Mergemaster won't let me have both my /usr/local/bin/zsh and the /bin/tcsh. During merge I can have either but not both :( Joe annoying when you onl On Wed, Sep 20, 2000 at 09:34:03PM +0100, Brian Somers wrote: > > 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. > > Of course if we didn't need it... that'd be far better :-) > > > 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. > > That's not too bad as the read -p can be changed to echo/read. > > > - On OpenBSD, "install" is synonymous to "install -c". FreeBSD still > > has the old behavior where plain "install" deletes the source file. > > Maybe the best bet here is to have ``INSTALL=install'' at the top of > the script (``INSTALL="install -c" for FreeBSD). It's a difference, > but managable. > > > 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. > > Aye. Looks like we're thinking along the same lines. > > I'll have to talk to Wes at BSDCon about trying to get the NetBSD > guys to introduce it there too - maybe some of the NetBSD developers > will be there too. > > > -- > > Christian "naddy" Weisgerber naddy@mips.inka.de > > -- > Brian > > Don't _EVER_ lose your sense of humour ! > > > > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-hackers" in the body of the message -- Josef Karthauser FreeBSD: How many times have you booted today? Technical Manager Viagra for your server (http://www.uk.freebsd.org) Pavilion Internet plc. [joe@pavilion.net, joe@uk.freebsd.org, joe@tao.org.uk] To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message