From owner-svn-src-stable-8@FreeBSD.ORG Sat May 4 19:06:15 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 47FCA410; Sat, 4 May 2013 19:06:15 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) by mx1.freebsd.org (Postfix) with ESMTP id 079D3AEC; Sat, 4 May 2013 19:06:14 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7::3182:ceec:e196:7d98] (unknown [IPv6:2001:7b8:3a7:0:3182:ceec:e196:7d98]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 3C0C65C45; Sat, 4 May 2013 21:06:12 +0200 (CEST) Content-Type: text/plain; charset=iso-8859-1 Mime-Version: 1.0 (Mac OS X Mail 6.3 \(1503\)) Subject: Re: svn commit: r250249 - in stable/8/sys: . amd64/amd64 dev/sound i386/i386 kern From: Dimitry Andric In-Reply-To: Date: Sat, 4 May 2013 21:06:12 +0200 Content-Transfer-Encoding: quoted-printable Message-Id: <9AFDCE3E-8967-428A-89C2-4C9F9888E040@FreeBSD.org> References: <201305041849.r44In5HK095619@svn.freebsd.org> To: mdf@FreeBSD.org X-Mailer: Apple Mail (2.1503) Cc: svn-src-stable@freebsd.org, "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , svn-src-stable-8@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: Sat, 04 May 2013 19:06:15 -0000 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) >=20 > 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)? >=20 > 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.