Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 13 Mar 2010 21:26:43 -0800
From:      Doug Barton <dougb@FreeBSD.org>
To:        freebsd-stable@freebsd.org
Subject:   Re: I broke my SSH to jails after 7.2-8.0 src upgrade
Message-ID:  <4B9C7393.4070409@FreeBSD.org>
In-Reply-To: <4B99B277.506@ibctech.ca>
References:  <4B99AAD3.9060606@ibctech.ca>	<a78074951003111849m7f9aa56fkd4ec9bbafcd395ee@mail.gmail.com>	<4B99AD1B.3040409@ibctech.ca>	<a78074951003111914i3b2a73d2ue438079ab56d2c3@mail.gmail.com> <4B99B277.506@ibctech.ca>

next in thread | previous in thread | raw e-mail | index | archive | help
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/




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4B9C7393.4070409>