From owner-freebsd-questions@FreeBSD.ORG Mon Apr 6 12:03:57 2009 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 14DAC10659C5 for ; Mon, 6 Apr 2009 12:03:56 +0000 (UTC) (envelope-from sonic2000gr@gmail.com) Received: from mail-bw0-f164.google.com (mail-bw0-f164.google.com [209.85.218.164]) by mx1.freebsd.org (Postfix) with ESMTP id 281B78FC27 for ; Mon, 6 Apr 2009 12:03:55 +0000 (UTC) (envelope-from sonic2000gr@gmail.com) Received: by bwz8 with SMTP id 8so1795681bwz.43 for ; Mon, 06 Apr 2009 05:03:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=e2AelG0njiMRrokVYF52GVnb41qf0KK+fcL71ghRsM8=; b=O+Qz2OVwIDaL74++O1MTr7CcrKNqlzPoM3d1pBU8CZyCjU8SK2Z4KX94m8pS/O2lIX ldbwkXxlAEgkQJ8od0ZhY9fSfTDbwNpU4oTH77BBw0yAYu/r+C1YF9WjDGaTm4jw+E1c 3CA7xZS8lTP0+zS9m2PLz3iKgcPDWeDd4Dkp8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=cCygiKwm3iiCMfkIu+6fKA9WZ2iPWZnWUkxz9z5vMobdl7uNGyzxx7fxnnIe3kyvHR GaQvPnfBwV+FVSCYUSqpIvykfabXG7lKEtdPjuDRqB0PVZ+xW+eaa8twSk4eV0QwCNKO L1fO/0z9pbn+QtqrQXLx/72Uwx6KdeGVmZFTo= Received: by 10.223.103.207 with SMTP id l15mr3701778fao.2.1239019434920; Mon, 06 Apr 2009 05:03:54 -0700 (PDT) Received: from atlantis.dyndns.org (ppp-94-69-68-78.home.otenet.gr [94.69.68.78]) by mx.google.com with ESMTPS id 35sm2241433fkt.3.2009.04.06.05.03.53 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 06 Apr 2009 05:03:54 -0700 (PDT) Message-ID: <49D9EFA8.709@gmail.com> Date: Mon, 06 Apr 2009 15:03:52 +0300 From: Manolis Kiagias User-Agent: Thunderbird 2.0.0.21 (X11/20090330) MIME-Version: 1.0 To: Charles Howse References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: FreeBSD Questions Subject: Re: mergemaster options 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: Mon, 06 Apr 2009 12:04:20 -0000 Charles Howse wrote: > Hi, > I'm upgrading form 4.6-RELEASE to 4.6-STABLE. > When I get to the *second* run of mergemaster (after installworld), > I'd be interested to hear the list's comments on using options to > start mergemaster. > > For example, have you had good luck with: > mergemaster -i -u (install any files that don't already exist, and > attempt to install any files that haven't been user-modified) Yes, I am using this all the time. Note that you need a capital "U": mergemaster -iU > > Also, what is the first line of a file used for? What parts of the OS > 'care' about that line? What would happen if I kept the existing file > below, with it's older date and version #? (This is just a made-up > example). > > keep this existing file: > # $FreeBSD: src/etc/csh.cshrc,v 1.3 1999/08/27 23:23:40 peter Exp $ > my custom line > blah > > delete this (fake) temporary file: > # $FreeBSD: src/etc/csh.cshrc,v 1.4 2000/08/27 23:23:40 peter Exp $ > blah > blah > > I hope that's clear...? > The lines you see starting with $FreeBSD are used by the Version Control System (CVS or SVN). You have to judge by the content of the older file (not by the tag) whether to keep or upgrade the file. Usually, you will let it upgrade all files which you have not modified yourself. In some of these the only thing that changes is the tag. Before doing the mergemaster step, I suggest you keep a complete backup copy of your /etc directory. It may happen that you replace a file you actually need. And it is a real problem if you overwrite, say, master.passwd :)