Date: Wed, 05 Sep 2001 18:20:42 +0200 From: Eric Veraart <eric@monkey-online.net> To: Andy Farkas <andyf@speednet.com.au> Cc: freebsd-stable@FreeBSD.ORG, DougB@FreeBSD.ORG Subject: Re: mergemaster Message-ID: <3B9650DA.F391CEAB@monkey-online.net> References: <Pine.BSF.4.33.0109052148580.50604-100000@backup.af.speednet.com.au>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3B9650DA.F391CEAB>