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://obr...@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 (obr...@freebsd.org) _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
