From owner-svn-src-all@FreeBSD.ORG Tue Mar 24 04:36:32 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65AB4106566C; Tue, 24 Mar 2009 04:36:32 +0000 (UTC) (envelope-from obrien@NUXI.org) Received: from dragon.nuxi.org (trang.nuxi.org [74.95.12.85]) by mx1.freebsd.org (Postfix) with ESMTP id 40FB28FC0A; Tue, 24 Mar 2009 04:36:32 +0000 (UTC) (envelope-from obrien@NUXI.org) Received: from dragon.nuxi.org (obrien@localhost [127.0.0.1]) by dragon.nuxi.org (8.14.3/8.14.3) with ESMTP id n2O4aPGl038999; Mon, 23 Mar 2009 21:36:25 -0700 (PDT) (envelope-from obrien@dragon.nuxi.org) Received: (from obrien@localhost) by dragon.nuxi.org (8.14.3/8.14.2/Submit) id n2O4aONf038998; Mon, 23 Mar 2009 21:36:24 -0700 (PDT) (envelope-from obrien) Date: Mon, 23 Mar 2009 21:36:24 -0700 From: "David O'Brien" To: Sam Leffler Message-ID: <20090324043624.GB34952@dragon.NUXI.org> References: <200903240151.n2O1pgT0028693@svn.freebsd.org> <49C844A5.5080506@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <49C844A5.5080506@freebsd.org> X-Operating-System: FreeBSD 8.0-CURRENT User-Agent: Mutt/1.5.16 (2007-06-09) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r190357 - in stable/7: gnu/usr.bin/grep include lib/libelf sbin/fsck sbin/fsck_ffs sbin/mount usr.bin/gprof usr.bin/make usr.sbin/crunch usr.sbin/sade usr.sbin/sysinstall X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: obrien@freebsd.org List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Mar 2009 04:36:32 -0000 On Mon, Mar 23, 2009 at 07:25:41PM -0700, Sam Leffler wrote: > David E. O'Brien wrote: >> Author: obrien >> Date: Tue Mar 24 01:51:42 2009 >> New Revision: 190357 >> URL: http://svn.freebsd.org/changeset/base/190357 >> >> Log: >> MFC: r186581: Sound less scary about errorousous disk geometry. .. > This looks to have many changes unrelated to r186581. For example you > just removed the -C option to fsck. I found out that Subversion wasn't getting the mergeinfo right. It considers svn+ssh://obrien@svn.freebsd.org/base/ and svn+ssh://svn.freebsd.org/base/ to be two totally seperate repositories. So I did some 'merge -c ... --record-only' to get the earlier merges. I fat fingered the ones for fsck, forgetting the --record-only the first time. Not sure where 'svn revert -R sbin/fsck*' went wrong when I did that before doing the merge again with '--record-only'. Subversions merge handling seems to be one of its warts. -- -- David (obrien@FreeBSD.org)