From owner-freebsd-stable@FreeBSD.ORG Sun Mar 14 09:29:43 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 E74C1106566B; Sun, 14 Mar 2010 09:29:43 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from mail-px0-f200.google.com (mail-px0-f200.google.com [209.85.216.200]) by mx1.freebsd.org (Postfix) with ESMTP id B43BE8FC17; Sun, 14 Mar 2010 09:29:43 +0000 (UTC) Received: by pxi38 with SMTP id 38so321452pxi.27 for ; Sun, 14 Mar 2010 01:29:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=4NX6F7CrFcvnbRixWGRb+XqjCmf57mcbr6XX+5SaDXs=; b=WHufW+78rJiwC+R0IDnvJF5YwCIlDPdquHgoZjRCDRFy2WJBVn2L62A9Cm7FqCKn9u mq6vm9Ufzgvo2Z3MLA/rA/ZlIDk6dnQpuayUBeoB21djBnYkyRcMOoAzcfDLpBkYAiz7 bEnw1T/acywOYXUlbZtFOgzxROJlknehGzFjQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=p53lXR0Jc6M9jWD+dwdECvS0JqibIdatn97if+SJdXn6RbrUZvaNcc/+kMqAT1dV9S PH292wAKfvr6cO/1AVSCuu65VQV7LQM/GaIAiwWU05iMvPpPD1nwbY35RBXAZme5o1SB TPCyPogznRG8QxhJO2KJ+4A5/f8G5Ojz6pjPM= MIME-Version: 1.0 Received: by 10.143.136.2 with SMTP id o2mr431641wfn.189.1268558983273; Sun, 14 Mar 2010 01:29:43 -0800 (PST) In-Reply-To: <4B9C745B.5080404@FreeBSD.org> References: <4B99AAD3.9060606@ibctech.ca> <4B99B197.3060504@ibctech.ca> <4B99B2E2.6050705@ibctech.ca> <4B99BB0E.7080000@delphij.net> <4B99C270.9040703@ibctech.ca> <7d6fde3d1003112033k3ce3b040y8edac8772747862f@mail.gmail.com> <4B9C745B.5080404@FreeBSD.org> Date: Sun, 14 Mar 2010 01:29:43 -0800 Message-ID: <7d6fde3d1003140129q22b53fc5pf483427b6c633f12@mail.gmail.com> From: Garrett Cooper To: Doug Barton Content-Type: text/plain; charset=ISO-8859-1 Cc: freebsd-stable@freebsd.org 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: Sun, 14 Mar 2010 09:29:44 -0000 On Sat, Mar 13, 2010 at 9:30 PM, Doug Barton 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