From owner-freebsd-questions@FreeBSD.ORG  Wed Jan  7 06:24:52 2009
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
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 6B9D8106566C
	for <freebsd-questions@freebsd.org>;
	Wed,  7 Jan 2009 06:24:52 +0000 (UTC)
	(envelope-from roberthuff@rcn.com)
Received: from smtp02.lnh.mail.rcn.net (smtp02.lnh.mail.rcn.net
	[207.172.157.102])
	by mx1.freebsd.org (Postfix) with ESMTP id 244348FC14
	for <freebsd-questions@freebsd.org>;
	Wed,  7 Jan 2009 06:24:51 +0000 (UTC)
	(envelope-from roberthuff@rcn.com)
Received: from mr02.lnh.mail.rcn.net ([207.172.157.22])
	by smtp02.lnh.mail.rcn.net with ESMTP; 07 Jan 2009 01:24:51 -0500
Received: from smtp01.lnh.mail.rcn.net (smtp01.lnh.mail.rcn.net [207.172.4.11])
	by mr02.lnh.mail.rcn.net (MOS 3.10.4-GA) with ESMTP id PJP69461;
	Wed, 7 Jan 2009 01:24:03 -0500 (EST)
Received: from unknown (HELO jerusalem.litteratus.org.litteratus.org)
	([209.6.22.188])
	by smtp01.lnh.mail.rcn.net with ESMTP; 07 Jan 2009 01:24:03 -0500
From: Robert Huff <roberthuff@rcn.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-ID: <18788.19074.638345.767831@jerusalem.litteratus.org>
Date: Wed, 7 Jan 2009 01:24:02 -0500
To: Yuri Pankov <yuri.pankov@gmail.com>
In-Reply-To: <20090107061339.GB12584@darklight.homeunix.org>
References: <ab52c4f40901061328i254481d9obb36bcf53757d7db@mail.gmail.com>
	<4964467D.9020606@boosten.org>
	<20090107061339.GB12584@darklight.homeunix.org>
X-Mailer: VM 7.17 under 21.5  (beta28) "fuki" XEmacs Lucid
X-Junkmail-Whitelist: YES (by domain whitelist at mr02.lnh.mail.rcn.net)
Cc: Johann Hasselbach <jhass88@gmail.com>, freebsd-questions@freebsd.org,
	Peter Boosten <peter@boosten.org>
Subject: Re: mergemaster goof when src upgrading 7.0 -> 7.1
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2009 06:24:52 -0000


Yuri Pankov writes:

>  > Also: most scripts updated by mergemaster during 7.0->7.1 are only
>  > version numbering diffs. Is there no smarter way to do this, apart from
>  > typing 'i' every time?
>  
>  I think you want -U option (auto upgrade files that have not been
>  modified by user) along with -i (install missing files).

	How does it deteremine what's been user-modified?  I've got a
few things that have local edits that, for reasons of laziness,
still have the same version tag. 


				Robert Huff