From owner-svn-src-stable@FreeBSD.ORG Wed Nov 10 17:00:40 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DFEDD106566B; Wed, 10 Nov 2010 17:00:39 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id AA4258FC13; Wed, 10 Nov 2010 17:00:39 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 560D846B2D; Wed, 10 Nov 2010 12:00:39 -0500 (EST) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 83CD58A009; Wed, 10 Nov 2010 12:00:38 -0500 (EST) From: John Baldwin To: Norikatsu Shigemura Date: Wed, 10 Nov 2010 12:00:07 -0500 User-Agent: KMail/1.13.5 (FreeBSD/7.3-CBSD-20100819; KDE/4.4.5; amd64; ; ) References: <201011100522.oAA5MDLb084941@svn.freebsd.org> <4CDA3247.1000608@freebsd.org> <20101111014721.bc6556e1.nork@FreeBSD.org> In-Reply-To: <20101111014721.bc6556e1.nork@FreeBSD.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201011101200.07324.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Wed, 10 Nov 2010 12:00:38 -0500 (EST) X-Virus-Scanned: clamav-milter 0.96.3 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.9 required=4.2 tests=BAYES_00 autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bigwig.baldwin.cx Cc: src-committers@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, Andriy Gapon , 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... X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2010 17:00:40 -0000 On Wednesday, November 10, 2010 11:47:21 am Norikatsu Shigemura wrote: > On Wed, 10 Nov 2010 07:48:55 +0200 > Andriy Gapon 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-' 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