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...

[John Baldwin]

On Wednesday, November 10, 2010 11:47:21 am Norikatsu Shigemura wrote:
> On Wed, 10 Nov 2010 07:48:55 +0200
> Andriy Gapon <avg at FreeBSD.org> wrote:
> > Hmm, properties changing on pretty much all directories and files with
> > svn:mergeinfo doesn't look correct.
> 
> 	Humm, my operations are confirmed by mentor (imp@).  But I was
> 	explained by hrs, ume and nyan about this case, too.  Sorry, I
> 	forgot http://wiki.freebsd.org/SubversionPrimer/Merging.
> 	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.

-- 
John Baldwin