Date: Sat, 4 May 2013 21:06:12 +0200 From: Dimitry Andric <dim@FreeBSD.org> To: mdf@FreeBSD.org Cc: svn-src-stable@freebsd.org, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r250249 - in stable/8/sys: . amd64/amd64 dev/sound i386/i386 kern Message-ID: <9AFDCE3E-8967-428A-89C2-4C9F9888E040@FreeBSD.org> In-Reply-To: <CAMBSHm93hTk-fWmeeKyX-e%2B9o4r1CMEyRJVA9D%2BTXd%2B38T1gTA@mail.gmail.com> References: <201305041849.r44In5HK095619@svn.freebsd.org> <CAMBSHm93hTk-fWmeeKyX-e%2B9o4r1CMEyRJVA9D%2BTXd%2B38T1gTA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On May 4, 2013, at 20:51, mdf@FreeBSD.org wrote: > On Sat, May 4, 2013 at 11:49 AM, Matthew D Fleming <mdf@freebsd.org> 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?9AFDCE3E-8967-428A-89C2-4C9F9888E040>