svn commit: r215077 - in stable/8: . contrib/top etc/periodic/daily gnu/usr.bin lib/libusb release/picobsd/floppy.tree/sbin sbin/geom/class/sched sys/modules tools/regression/lib/msun tools/regress...

[Norikatsu Shigemura]

On Wed, 10 Nov 2010 12:00:07 -0500
John Baldwin <jhb at freebsd.org> wrote:
> > 	So I'll contact to mentor, and remove svn:mergeinfo (r211201,
> > 	r211204, r211270-r211271, r212861, r211249) from src/ exclude
> > 	src/sys.
> If you want to fix the mergeinfo, the easiest way I've found to do so, is to 
> do 'svn merge --record-only -c-<xxxxx>' for each of the changes.  Then go back 
> and redo the svn merges to the proper locations using '--record-only'.  This 
> should only affect mergeinfo and nothing else.

	Thank you!
	I'll confirm operations you said, and test on my local environment.

-- 
Norikatsu Shigemura <nork at FreeBSD.org>