From owner-freebsd-hackers Thu Sep 21 11:36: 4 2000 Delivered-To: freebsd-hackers@freebsd.org Received: from theshell.com (arsenic.theshell.com [63.236.138.5]) by hub.freebsd.org (Postfix) with SMTP id 52ECF37B61D for ; Thu, 21 Sep 2000 11:35:53 -0700 (PDT) Received: (qmail 23762 invoked from network); 21 Sep 2000 18:36:03 -0000 Received: from arsenic.theshell.com (HELO tequila) (63.236.138.5) by arsenic.theshell.com with SMTP; 21 Sep 2000 18:36:03 -0000 From: "Peter Avalos" To: "Josef Karthauser" Cc: Subject: RE: mergemaster RFC (long) Date: Thu, 21 Sep 2000 13:35:42 -0500 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook IMO, Build 9.0.2416 (9.0.2911.0) In-Reply-To: <20000921184449.K1694@pavilion.net> Importance: Normal X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4133.2400 Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG %? l: use the left version r: use the right version e l: edit then use the left version e r: edit then use the right version e b: edit then use the left and right versions concatenated e: edit a new version s: silently include common lines v: verbosely include common lines q: quit Look like 'e b' was designed for that. Peter Avalos TheShell.com -----BEGIN GEEK CODE BLOCK----- Version: 3.12 GCS/ED/B d-(+) s:+> a-- C++$ UBLO++++$ P+ L++++ E- W+ N+ o? K? w(++) !O M- V- PS+ PE++ Y+ PGP++ t+@ 5 X- R- tv+ b++ DI- D-- G e>+++ h-- r++ y++ ------END GEEK CODE BLOCK------ > -----Original Message----- > From: owner-freebsd-hackers@FreeBSD.ORG > [mailto:owner-freebsd-hackers@FreeBSD.ORG]On Behalf Of Josef Karthauser > Sent: Thursday, September 21, 2000 12:45 PM > To: Brian Somers > Cc: Christian Weisgerber; freebsd-hackers@FreeBSD.ORG > Subject: Re: mergemaster RFC (long) > > > > 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 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message