From owner-freebsd-questions@FreeBSD.ORG Sun Jan 20 15:13:28 2008 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8974F16A46D for ; Sun, 20 Jan 2008 15:13:28 +0000 (UTC) (envelope-from zszalbot@gmail.com) Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.191]) by mx1.freebsd.org (Postfix) with ESMTP id DB83E13C455 for ; Sun, 20 Jan 2008 15:13:27 +0000 (UTC) (envelope-from zszalbot@gmail.com) Received: by nf-out-0910.google.com with SMTP id b2so173038nfb.33 for ; Sun, 20 Jan 2008 07:13:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; bh=5lQ1UiFnNzI72Jli405tjFZfPN5+n1huKPLoaC+tnCE=; b=NGqq+TjpnSoprMeOog3K19/6TzeYkUAwBF5IyoCvnqkIXITNUP+FQacxhUi47b1sDphSmnRZwd9xBbt7Q52+DdauSXYRMIY11V+/Iu4TaIPVqYlJZtqxcDKANn4BDLsoslW0u8W1b3jWARNCybCG/GN+N1VPjdmSclj2HtSXoD4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=NC254JT0YrECWxLGnOXSAIX8F1ATPj1eZwzBO8Oxu3aV0mo9J7XzR/6VaMGRTe+30kY1fiq1opZ+YQmnkqbOYcYD3G7ybD/TEyMV8ak8eo3tTEBIrQ2YwAUz4arepZTO4sD5DqwRfaRq4Z6okQkXHpcjp6B6rXoIThauw1WMRjQ= Received: by 10.78.171.20 with SMTP id t20mr7774254hue.41.1200842006179; Sun, 20 Jan 2008 07:13:26 -0800 (PST) Received: by 10.78.130.5 with HTTP; Sun, 20 Jan 2008 07:13:26 -0800 (PST) Message-ID: <94136a2c0801200713k3fdda593m4da8c93b23feaa0d@mail.gmail.com> Date: Sun, 20 Jan 2008 16:13:26 +0100 From: "Zbigniew Szalbot" To: RW In-Reply-To: <20080120000048.0cee1189@gumby.homeunix.com.> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <94136a2c0801191142r51a7715by99e56ee658621e5d@mail.gmail.com> <20080120000048.0cee1189@gumby.homeunix.com.> Cc: freebsd-questions@freebsd.org Subject: Re: 6.2-Release to 6.3-Release and automatically merge changes X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jan 2008 15:13:28 -0000 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