Date: Sun, 14 Mar 2010 01:29:43 -0800 From: Garrett Cooper <yanefbsd@gmail.com> To: Doug Barton <dougb@freebsd.org> Cc: freebsd-stable@freebsd.org Subject: Re: I broke my SSH to jails after 7.2-8.0 src upgrade Message-ID: <7d6fde3d1003140129q22b53fc5pf483427b6c633f12@mail.gmail.com> In-Reply-To: <4B9C745B.5080404@FreeBSD.org> References: <4B99AAD3.9060606@ibctech.ca> <a78074951003111849m7f9aa56fkd4ec9bbafcd395ee@mail.gmail.com> <4B99B197.3060504@ibctech.ca> <4B99B2E2.6050705@ibctech.ca> <4B99BB0E.7080000@delphij.net> <4B99C270.9040703@ibctech.ca> <7d6fde3d1003112033k3ce3b040y8edac8772747862f@mail.gmail.com> <4B9C745B.5080404@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Mar 13, 2010 at 9:30 PM, Doug Barton <dougb@freebsd.org> wrote: > On 03/11/10 20:33, 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. > > It would be really great if you could submit a proper bug report for > this. If there are underlying problems with mergemaster I want to fix them. > > Meanwhile, mergemaster doesn't have an 'automatic merging logic' of its > own. It either uses mtree for the -U option, or sdiff if you merge by > hand. Without more information, it's hard to provide more useful > assistance. I'll definitely provide more helpful feedback when I have more helpful data and steps to reproduce the `issues' that I'm seeing. >> -a doesn't actually do any merging though, FWIW: > > Thanks for helping the user with this information. :) Np... thanks for the help automating things ;)... -Garrett
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7d6fde3d1003140129q22b53fc5pf483427b6c633f12>