From owner-freebsd-hackers  Mon Jun 18  9: 4:38 2001
Delivered-To: freebsd-hackers@freebsd.org
Received: from l04.research.kpn.com (l04.research.kpn.com [139.63.192.204])
	by hub.freebsd.org (Postfix) with ESMTP id 3808C37B401
	for <freebsd-hackers@freebsd.org>; Mon, 18 Jun 2001 09:04:35 -0700 (PDT)
	(envelope-from K.J.Koster@kpn.com)
Received: by l04.research.kpn.com with Internet Mail Service (5.5.2653.19)
	id <LN2LAWQL>; Mon, 18 Jun 2001 18:04:34 +0100
Message-ID: <59063B5B4D98D311BC0D0001FA7E452205FD9CBF@l04.research.kpn.com>
From: "Koster, K.J." <K.J.Koster@kpn.com>
To: 'James' <James_Bond_79@yahoo.com>
Cc: 'FreeBSD Hackers mailing list' <freebsd-hackers@freebsd.org>
Subject: RE: Mergemaster bug + new feature [patch]
Date: Mon, 18 Jun 2001 18:04:30 +0100
MIME-Version: 1.0
X-Mailer: Internet Mail Service (5.5.2653.19)
Content-Type: text/plain;
	charset="iso-8859-1"
Sender: owner-freebsd-hackers@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-hackers.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20freebsd-hackers>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20freebsd-hackers>
X-Loop: FreeBSD.ORG

Dear James,

I had a mergemaster problem a while back, but I haven't debugged it
properly. I had my /etc/ppp symlinked into /home/root/ppp. Then, after a
mergemaster run I ended up with a file named /etc/ppp, which had the
contents of the new version of /etc/ppp/ppp.conf.

This box used to dial out, but no longer does so I did not care about/pursue
the problem. Sorry about the scetchy information.

    Kees Jan

PS. I initially read the subject line as "mergemaster has one fewer bug and
one newly discovered feature". :)

================================================
 You are only young once,
       but you can stay immature all your life.

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message