From owner-svn-src-all@FreeBSD.ORG Mon May 6 19:02:20 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 97DF3667; Mon, 6 May 2013 19:02:20 +0000 (UTC) (envelope-from dim@freebsd.org) Received: from tensor.andric.com (tensor.andric.com [IPv6:2001:7b8:3a7:1:2d0:b7ff:fea0:8c26]) by mx1.freebsd.org (Postfix) with ESMTP id 5B4DFB7E; Mon, 6 May 2013 19:02:20 +0000 (UTC) Received: from [IPv6:2001:7b8:3a7::cd6b:c604:1989:9c5c] (unknown [IPv6:2001:7b8:3a7:0:cd6b:c604:1989:9c5c]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 512DE5C5B; Mon, 6 May 2013 21:02: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: Mon, 6 May 2013 21:02:08 +0200 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201305041849.r44In5HK095619@svn.freebsd.org> <9AFDCE3E-8967-428A-89C2-4C9F9888E040@FreeBSD.org> <201305060959.52379.jhb@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, John Baldwin X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 May 2013 19:02:20 -0000 On May 6, 2013, at 20:27, mdf@FreeBSD.org wrote: > On Mon, May 6, 2013 at 6:59 AM, John Baldwin wrote: ... > 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. >=20 > 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? No, the spurious mergeinfo is not harmful, just a bit ugly. It should = be removed manually, by an svn expert (with a tiny bit of OCD... ;-). I think the stable/8 tree just contains more of this spurious merge = info, simply because a lot of that tree was created when svn 1.6 was the = current version.