From owner-freebsd-stable@FreeBSD.ORG Fri Mar 12 10:13:09 2010 Return-Path: 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 462E11065676 for ; Fri, 12 Mar 2010 10:13:09 +0000 (UTC) (envelope-from byshenknet@byshenk.net) Received: from core.byshenk.net (core.byshenk.net [62.58.73.230]) by mx1.freebsd.org (Postfix) with ESMTP id CF67D8FC1A for ; Fri, 12 Mar 2010 10:13:08 +0000 (UTC) Received: from core.byshenk.net (localhost [127.0.0.1]) by core.byshenk.net (8.14.4/8.14.4) with ESMTP id o2CADpGZ029804; Fri, 12 Mar 2010 11:13:51 +0100 (CET) (envelope-from byshenknet@core.byshenk.net) Received: (from byshenknet@localhost) by core.byshenk.net (8.14.4/8.14.4/Submit) id o2CADouh029803; Fri, 12 Mar 2010 11:13:50 +0100 (CET) (envelope-from byshenknet) Date: Fri, 12 Mar 2010 11:13:50 +0100 From: Greg Byshenk To: freebsd-stable@freebsd.org Message-ID: <20100312101350.GH2303@core.byshenk.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7d6fde3d1003112033k3ce3b040y8edac8772747862f@mail.gmail.com> User-Agent: Mutt/1.4.2.3i X-Spam-Status: No, score=4.1 required=5.0 tests=ALL_TRUSTED,FAKE_REPLY_C, FH_DATE_PAST_20XX autolearn=no version=3.2.5 X-Spam-Level: **** X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on core.byshenk.net Cc: Garrett Cooper , d@delphij.net, Steve Bertrand , Xin LI 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Mar 2010 10:13:09 -0000 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@byshenk.net - Leiden, NL