Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Jan 2008 16:13:26 +0100
From:      "Zbigniew Szalbot" <zszalbot@gmail.com>
To:        RW <fbsd06@mlists.homeunix.com>
Cc:        freebsd-questions@freebsd.org
Subject:   Re: 6.2-Release to 6.3-Release and automatically merge changes
Message-ID:  <94136a2c0801200713k3fdda593m4da8c93b23feaa0d@mail.gmail.com>
In-Reply-To: <20080120000048.0cee1189@gumby.homeunix.com.>
References:  <94136a2c0801191142r51a7715by99e56ee658621e5d@mail.gmail.com> <20080120000048.0cee1189@gumby.homeunix.com.>

next in thread | previous in thread | raw e-mail | index | archive | help
Hello,

> Anything in /etc/defaults/ should not have been edited, so just accept
> the new version. If you *have* edited it, you'll have to handle this
> manually, and put you changes in the right place.

I don't think I have ever edited any file in /etc/defaults but then...
sometimes my mind plays a trick on me.

> > Then it asked about sendmail files which I have never ever touched (I
> > do not use sendmail). Some others are not sendmail-related but I have
> > not touched them either.
>
> Accept the new versions.

When I have these strings:

<<<<<<< current version
# $FreeBSD: src/etc/defaults/periodic.conf,v 1.33.2.1 2006/03/08
23:01:18 brueffer Exp $
=======
# $FreeBSD: src/etc/defaults/periodic.conf,v 1.33.2.3.2.1 2007/12/06
08:11:19 jhb Exp $
>>>>>>> 6.3-RELEASE

Which lines should I delete and which leave intact?
This one here is short but there are some other where the changes
apply to quite a few lines. I have trouble finding out how to "accept
the new versions"?

Thanks!

Zbigniew Szalbot



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?94136a2c0801200713k3fdda593m4da8c93b23feaa0d>