Date: Thu, 21 Sep 2000 18:44:49 +0100 From: Josef Karthauser <joe@pavilion.net> To: Brian Somers <brian@Awfulhak.org> Cc: Christian Weisgerber <naddy@mips.inka.de>, freebsd-hackers@FreeBSD.ORG Subject: Re: mergemaster RFC (long) Message-ID: <20000921184449.K1694@pavilion.net> In-Reply-To: <200009202034.e8KKY3s18401@hak.lan.Awfulhak.org>; from brian@Awfulhak.org on Wed, Sep 20, 2000 at 09:34:03PM %2B0100 References: <8q62st$1nkh$1@ganerc.mips.inka.de> <200009202034.e8KKY3s18401@hak.lan.Awfulhak.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <brian@Awfulhak.org> 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 <prompt>" 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 <brian@Awfulhak.org> <brian@[uk.]FreeBSD.org>
> <http://www.Awfulhak.org>; <brian@[uk.]OpenBSD.org>
> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000921184449.K1694>