From owner-svn-src-stable-8@FreeBSD.ORG Mon May 6 17:49:39 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8C115E4F; Mon, 6 May 2013 17:49:39 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) by mx1.freebsd.org (Postfix) with ESMTP id 65C1C641; Mon, 6 May 2013 17:49:39 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 7ED53B911; Mon, 6 May 2013 13:49:38 -0400 (EDT) From: John Baldwin To: Dimitry Andric Subject: Re: svn commit: r250249 - in stable/8/sys: . amd64/amd64 dev/sound i386/i386 kern Date: Mon, 6 May 2013 09:59:52 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p25; KDE/4.5.5; amd64; ; ) References: <201305041849.r44In5HK095619@svn.freebsd.org> <9AFDCE3E-8967-428A-89C2-4C9F9888E040@FreeBSD.org> In-Reply-To: <9AFDCE3E-8967-428A-89C2-4C9F9888E040@FreeBSD.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201305060959.52379.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 06 May 2013 13:49:38 -0400 (EDT) Cc: mdf@freebsd.org, "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , svn-src-stable-8@freebsd.org, svn-src-stable@freebsd.org X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 May 2013 17:49:39 -0000 On Saturday, May 04, 2013 3:06:12 pm Dimitry Andric wrote: > On May 4, 2013, at 20:51, mdf@FreeBSD.org wrote: > > On Sat, May 4, 2013 at 11:49 AM, Matthew D Fleming wrote: > > Author: mdf > > Date: Sat May 4 18:49:04 2013 > > New Revision: 250249 > > URL: http://svnweb.freebsd.org/changeset/base/250249 > ...lots of changed properties... > > stable/8/sys/xen/ (props changed) > > > > This seems like an excessive amount of mergeinfo properties. Is stable/8 just borked that way (compared to 9) or did my svn client mess up somehow (which wouldn't make much sense since it worked for stable/9 okay)? > > > > I'm using svn 1.6.13 on this laptop. > > It will probably help if you upgrade to svn 1.7, which has marginally better merge logic. For some reason, 1.6 tends to add lots of property changes to each subdirectory, when merging. This was mostly fixed in 1.7. Also, because of 1.7 merges adding more subdir mergeinfo, 1.6 merges now add a lot more mergeinfo. 1.6 should really be avoided at this point for merges if at all possible. -- John Baldwin