From owner-freebsd-stable@FreeBSD.ORG  Sun Mar 14 05:26:45 2010
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 C5C38106566C
	for <freebsd-stable@freebsd.org>; Sun, 14 Mar 2010 05:26:45 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4])
	by mx1.freebsd.org (Postfix) with ESMTP id 5F4868FC08
	for <freebsd-stable@freebsd.org>; Sun, 14 Mar 2010 05:26:45 +0000 (UTC)
Received: (qmail 374 invoked by uid 399); 14 Mar 2010 05:26:44 -0000
Received: from localhost (HELO foreign.dougb.net)
	(dougb@dougbarton.us@127.0.0.1)
	by localhost with ESMTPAM; 14 Mar 2010 05:26:44 -0000
X-Originating-IP: 127.0.0.1
X-Sender: dougb@dougbarton.us
Message-ID: <4B9C7393.4070409@FreeBSD.org>
Date: Sat, 13 Mar 2010 21:26:43 -0800
From: Doug Barton <dougb@FreeBSD.org>
Organization: http://SupersetSolutions.com/
User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US;
	rv:1.9.1.7) Gecko/20100218 Thunderbird/3.0.1
MIME-Version: 1.0
To: freebsd-stable@freebsd.org
References: <4B99AAD3.9060606@ibctech.ca>	<a78074951003111849m7f9aa56fkd4ec9bbafcd395ee@mail.gmail.com>	<4B99AD1B.3040409@ibctech.ca>	<a78074951003111914i3b2a73d2ue438079ab56d2c3@mail.gmail.com>
	<4B99B277.506@ibctech.ca>
In-Reply-To: <4B99B277.506@ibctech.ca>
X-Enigmail-Version: 1.0.1
OpenPGP: id=D5B2F0FB
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: I broke my SSH to jails after 7.2-8.0 src upgrade
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: Sun, 14 Mar 2010 05:26:45 -0000

On 03/11/10 19:18, Steve Bertrand wrote:
> On 2010.03.11 22:14, Xin LI wrote:
>> Looks like you have a stale configuration.  DId you done mergemaster?
> 
> Yes. I performed it as such:
> 
> # mergemaster -Uia

The -a option is incompatible with -U AND -i (and -F for that matter).
However, it's my mistake that this issue has never previously been
addressed in the code. I just committed a fix for this, which I'll MFC
ASAP.


hth,

Doug

-- 

	... and that's just a little bit of history repeating.
			-- Propellerheads

	Improve the effectiveness of your Internet presence with
	a domain name makeover!    http://SupersetSolutions.com/