From owner-svn-src-stable@FreeBSD.ORG Mon May 6 18:27:27 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E4948DF; Mon, 6 May 2013 18:27:27 +0000 (UTC) (envelope-from mdf356@gmail.com) Received: from mail-qe0-f48.google.com (mail-qe0-f48.google.com [209.85.128.48]) by mx1.freebsd.org (Postfix) with ESMTP id 5106A95C; Mon, 6 May 2013 18:27:27 +0000 (UTC) Received: by mail-qe0-f48.google.com with SMTP id 9so2200375qea.21 for ; Mon, 06 May 2013 11:27:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=rE0TVLmZ3MFClp9mUMK2Ng6gP7ETFDFXOFteSQG396k=; b=AkXqNsR+q40H3CUF5uYTBz6BuxhwHEDjFsnOqnDN5japwC7ZU/JMc09ESQbfvOe1C7 ErbfOShKVhuzNTULGP0y9DvSLYxqyO+ptEzQ0YI7l2qIz+8N9rfPAX0l9f4NL9Q4dEhV CY6kw1TLB5OZ71RUs39wT8pX2bSAjKbc98g13Cy+itlg8fikg36CtwXG4AoH9S4d7VFq Okezcj8VCN1oRgAxRhQuOjtPId12aZT9FVsUejF+VzvVviThbMRKFDLxoJwx9rh8o/G/ zCl6nS+Y1uo/w8W7h3pweknfbzKYROuj9BFIn2Wrhs/Xrtezyi+w/eMRs9HYrx46qfQZ 6QKA== MIME-Version: 1.0 X-Received: by 10.49.104.7 with SMTP id ga7mr7430339qeb.27.1367864841445; Mon, 06 May 2013 11:27:21 -0700 (PDT) Sender: mdf356@gmail.com Received: by 10.229.127.152 with HTTP; Mon, 6 May 2013 11:27:21 -0700 (PDT) In-Reply-To: <201305060959.52379.jhb@freebsd.org> References: <201305041849.r44In5HK095619@svn.freebsd.org> <9AFDCE3E-8967-428A-89C2-4C9F9888E040@FreeBSD.org> <201305060959.52379.jhb@freebsd.org> Date: Mon, 6 May 2013 11:27:21 -0700 X-Google-Sender-Auth: mbR_C0OWhTWX59STl697Zu9G1w8 Message-ID: Subject: Re: svn commit: r250249 - in stable/8/sys: . amd64/amd64 dev/sound i386/i386 kern From: mdf@FreeBSD.org To: John Baldwin Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: svn-src-stable@freebsd.org, "svn-src-all@freebsd.org" , "src-committers@freebsd.org" , Dimitry Andric , svn-src-stable-8@freebsd.org X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 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: Mon, 06 May 2013 18:27:28 -0000 On Mon, May 6, 2013 at 6:59 AM, John Baldwin wrote: > 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. > Should I back this out, then, and re-do? And why did this happen on stable/8, but not stable/9 for the same MFC? Thanks, matthew