Date: Mon, 23 Mar 2009 21:36:24 -0700 From: "David O'Brien" <obrien@freebsd.org> To: Sam Leffler <sam@freebsd.org> 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 Message-ID: <20090324043624.GB34952@dragon.NUXI.org> In-Reply-To: <49C844A5.5080506@freebsd.org> References: <200903240151.n2O1pgT0028693@svn.freebsd.org> <49C844A5.5080506@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090324043624.GB34952>