From owner-freebsd-stable@FreeBSD.ORG  Fri Jul  3 14:36:46 2009
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0B6AF1065676
	for <freebsd-stable@freebsd.org>; Fri,  3 Jul 2009 14:36:46 +0000 (UTC)
	(envelope-from lstewart@freebsd.org)
Received: from lauren.room52.net (lauren.room52.net [210.50.193.198])
	by mx1.freebsd.org (Postfix) with ESMTP id 8FAC08FC27
	for <freebsd-stable@freebsd.org>; Fri,  3 Jul 2009 14:36:45 +0000 (UTC)
	(envelope-from lstewart@freebsd.org)
Received: from lstewart-laptop.caia.swin.edu.au (c149.al.cl.cam.ac.uk
	[128.232.110.149]) (authenticated bits=0)
	by lauren.room52.net (8.14.3/8.14.3) with ESMTP id n63EaUjB003686
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Sat, 4 Jul 2009 00:36:32 +1000 (EST)
	(envelope-from lstewart@freebsd.org)
Message-ID: <4A4E1769.3090209@freebsd.org>
Date: Fri, 03 Jul 2009 15:36:25 +0100
From: Lawrence Stewart <lstewart@freebsd.org>
User-Agent: Thunderbird 2.0.0.22 (X11/20090626)
MIME-Version: 1.0
To: Dominic Fandrey <kamikaze@bsdforen.de>
References: <4A4DC67C.3010804@bsdforen.de>	<1246623757.1855.54.camel@balrog.2hip.net>
	<4A4E14ED.5010309@bsdforen.de>
In-Reply-To: <4A4E14ED.5010309@bsdforen.de>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Status: No, score=-2.0 required=5.0 tests=AWL,BAYES_00,SPF_SOFTFAIL
	autolearn=disabled version=3.2.5
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on lauren.room52.net
Cc: freebsd-stable@freebsd.org, Robert Noland <rnoland@freebsd.org>
Subject: Re: mergemaster merge left/right
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Jul 2009 14:36:46 -0000

Dominic Fandrey wrote:
> Robert Noland wrote:
>> On Fri, 2009-07-03 at 10:51 +0200, Dominic Fandrey wrote:
>>> I'd really like mergemaster to tell me whether the left
>>> or the right side is the new file.
>>>
>>> # $FreeBSD: src/etc/devd.conf,v 1.38. |	# $FreeBSD: src/etc/devd.conf,v 1.38.
>>>
>>> Like this I have no idea which one to pick.
>> The right hand side is always the new file.
> 
> I know. Trial and error can tell you that. But I want
> mergemaster to tell me.

I'm sure Doug would be very happy to receive a patch to review. 
Mergemaster is a shell script so shouldn't be too difficult to hack 
something up.

Cheers,
Lawrence