I broke my SSH to jails after 7.2-8.0 src upgrade

[Doug Barton]

On 03/12/10 02:13, Greg Byshenk wrote:
> I would put in a word for 'mergemaster -F' (or maybe '-iF') in such
> cases.

At this point the -U option is generally a safer bet. The only time this
won't work for you is when upgrading from an older -RELEASE where you've
never run mergemaster previously, in which case it will bark loudly that
there is no mtree database. You could then run 'mergemaster -Fi' as you
suggested, and run 'mergemaster -U' immediately thereafter and you
should get as much "automation" as is possible.


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/