From owner-freebsd-stable  Wed Sep  5  9:20:57 2001
Delivered-To: freebsd-stable@freebsd.org
Received: from pandora.tiscali.nl (pandora.tiscali.nl [195.241.76.179])
	by hub.freebsd.org (Postfix) with ESMTP
	id 64A1037B409; Wed,  5 Sep 2001 09:20:53 -0700 (PDT)
Received: from monkey-online.net (unknown [195.241.113.9])
	by pandora.tiscali.nl (Postfix) with ESMTP
	id 52FDD36C48; Wed,  5 Sep 2001 18:20:47 +0200 (MET DST)
Message-ID: <3B9650DA.F391CEAB@monkey-online.net>
Date: Wed, 05 Sep 2001 18:20:42 +0200
From: Eric Veraart <eric@monkey-online.net>
X-Mailer: Mozilla 4.76 [en] (Windows NT 5.0; U)
X-Accept-Language: en
MIME-Version: 1.0
To: Andy Farkas <andyf@speednet.com.au>
Cc: freebsd-stable@FreeBSD.ORG, DougB@FreeBSD.ORG
Subject: Re: mergemaster
References: <Pine.BSF.4.33.0109052148580.50604-100000@backup.af.speednet.com.au>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-stable.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-stable>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-stable>
X-Loop: FreeBSD.ORG

I don't see the problem. Just install the temporary. The only difference
is that they changed /usr/obj/usr/src/etc/sendmail/freebsd.cf into
./usr/obj/usr/src/etc/sendmail/freebsd.cf and with that also both build
dates...

Andy Farkas wrote:
> 
> Is there a bug in recent mergemaster(8) that has a problem with diffing
> a sendmail.cf file in the /usr/obj tree?
> 
> The last file mergemaster prompts me about (when I do a 'mergemaster -sv')
> looks like this:
> 
>   *** Displaying differences between
> /usr/obj/usr/src/etc/sendmail/freebsd.cf and installed version:
> 
> --- /usr/obj/usr/src/etc/sendmail/freebsd.cf    Wed Sep  5 21:05:13 2001
> +++ ./usr/obj/usr/src/etc/sendmail/freebsd.cf   Wed Sep  5 21:37:44 2001
> @@ -17,7 +17,7 @@
>  #####
>  #####          SENDMAIL CONFIGURATION FILE
>  #####
> -##### built by root@hostname.my.domain on Wed Sep 5 21:05:13 EST 2001
> +##### built by root@hostname.my.domain on Wed Sep 5 21:37:44 EST 2001
>  ##### in /usr/src/etc/sendmail
>  ##### using /usr/src/etc/sendmail/../../contrib/sendmail/cf/ as configuration include directory
>  #####
> 
>   Use 'd' to delete the temporary ./usr/obj/usr/src/etc/sendmail/freebsd.cf
>   Use 'i' to install the temporary ./usr/obj/usr/src/etc/sendmail/freebsd.cf
>   Use 'm' to merge the temporary and installed versions
>   Use 'v' to view the diff results again
> 
>   Default is to leave the temporary file to deal with by hand
> 
> How should I deal with this? [Leave it for later]
> 
> --
> 
>  :{ andyf@speednet.com.au
> 
>         Andy Farkas
>     System Administrator
>    Speednet Communications
>  http://www.speednet.com.au/
> 
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-stable" in the body of the message

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