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

[Greg Byshenk]

On Thu, Mar 11, 2010 at 08:33:29PM -0800, Garrett Cooper wrote:
 
> I've done a few RELENG_8_0 to STABLE-8 to 9-CURRENT upgrades lately
> and mergemaster was goofing up the contents a bit based on the RCS
> versions. I had to hand-edit a crapload of stuff going from 8 to 9,
> and I still don't trust mergemaster's automatic merging logic because
> it goofs up on /etc/group // /etc/passwd still (doesn't merge
> anything, discards my info, etc) for starters.
> 
> -a doesn't actually do any merging though, FWIW:

[...]

I would put in a word for 'mergemaster -F' (or maybe '-iF') in such
cases.

It doesn't try to automate much, but it allows one to concentrate on
actual differences by automating the handling of those files where
only the VCS Id is different.

-- 
greg byshenk  -  gbyshenk at byshenk.net  -  Leiden, NL