Date: Wed, 10 Nov 2010 12:00:07 -0500 From: John Baldwin <jhb@freebsd.org> To: Norikatsu Shigemura <nork@freebsd.org> Cc: src-committers@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, Andriy Gapon <avg@freebsd.org>, svn-src-stable-8@freebsd.org, imp@freebsd.org Subject: Re: 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... Message-ID: <201011101200.07324.jhb@freebsd.org> In-Reply-To: <20101111014721.bc6556e1.nork@FreeBSD.org> References: <201011100522.oAA5MDLb084941@svn.freebsd.org> <4CDA3247.1000608@freebsd.org> <20101111014721.bc6556e1.nork@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wednesday, November 10, 2010 11:47:21 am Norikatsu Shigemura wrote: > On Wed, 10 Nov 2010 07:48:55 +0200 > Andriy Gapon <avg@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011101200.07324.jhb>