svn commit: r250249 - in stable/8/sys: . amd64/amd64 dev/sound i386/i386 kern
dim at FreeBSD.org
Sat May 4 19:06:15 UTC 2013
On May 4, 2013, at 20:51, mdf at FreeBSD.org wrote:
> On Sat, May 4, 2013 at 11:49 AM, Matthew D Fleming <mdf at 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.
More information about the svn-src-stable-8