From owner-svn-src-all@FreeBSD.ORG Mon May 6 20:34:02 2013 Return-Path: Delivered-To: svn-src-all@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 D5086286 for ; Mon, 6 May 2013 20:34:02 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-pb0-x22d.google.com (mail-pb0-x22d.google.com [IPv6:2607:f8b0:400e:c01::22d]) by mx1.freebsd.org (Postfix) with ESMTP id ABB4C272 for ; Mon, 6 May 2013 20:34:02 +0000 (UTC) Received: by mail-pb0-f45.google.com with SMTP id ro12so2181289pbb.32 for ; Mon, 06 May 2013 13:34:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=x-received:mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type; bh=iDoYrkrwGk53PFUJutGCGbVigL/vYAvldj6P7b3it5Y=; b=b5/FyfiSG280yvj01cymv9uL7wk+elJSyIQxxG8HMTLVL2fLQkndn2QYMfMPLwCrLY L3jxxBXsnbmu7F9svkIqPxp9Eub4nenn1ZiW17/B7rI/c15SNogw0SIKHV6I0FNQUA54 /1kmsYhRPglxR/AArREQfwo8c5nTzQAmqspzI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type :x-gm-message-state; bh=iDoYrkrwGk53PFUJutGCGbVigL/vYAvldj6P7b3it5Y=; b=hmomCdKsgvBjxoqD4fObJUVNAOBD6DfD9EDswJxmLB4C7npORgxK3fss7B+jAf+hp7 3+S3ntcjsoNh45Rfrx2R8+yAZSPxjd1TCrWfeEX0PgNyOVhPTAhF5Azgq18czYJRTnU6 bZRPQ5EoHtDtCRPGTHRQemNpPhC7/tqIFZB4dKg4izeuc4DFitG4TKdkURE4XKaJueVy yux7/25TcA0RbgZgeGPYVid9TnVuaGxS9bJ7jSgkkcZJBJVK5hBVpNY16+mXnwyyYegV tq0bLPktoE9h3twp1HSd32/Sg+FdnvTx1my6ZxAOkSbZeBaxUnk2JpjZRN9vmVA2kM+P ULUw== X-Received: by 10.68.255.130 with SMTP id aq2mr26841226pbd.164.1367872442314; Mon, 06 May 2013 13:34:02 -0700 (PDT) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.66.159.97 with HTTP; Mon, 6 May 2013 13:33:31 -0700 (PDT) In-Reply-To: References: <201305041849.r44In5HK095619@svn.freebsd.org> <9AFDCE3E-8967-428A-89C2-4C9F9888E040@FreeBSD.org> <201305060959.52379.jhb@freebsd.org> From: Eitan Adler Date: Mon, 6 May 2013 16:33:31 -0400 X-Google-Sender-Auth: GNkMtM2eodX3ZSWjrL7UhseGOBc Message-ID: Subject: Re: svn commit: r250249 - in stable/8/sys: . amd64/amd64 dev/sound i386/i386 kern To: Dimitry Andric Content-Type: text/plain; charset=UTF-8 X-Gm-Message-State: ALoCoQn8sEB6qzkZ5FA5PIXo6hRt4/FLc2D3mqufEtpBaaWJxGHRjPC5XJSB4jgg8PBh9mCHE8AK Cc: mdf@freebsd.org, "src-committers@freebsd.org" , John Baldwin , svn-src-stable@freebsd.org, "svn-src-all@freebsd.org" , svn-src-stable-8@freebsd.org 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 20:34:02 -0000 On 6 May 2013 15:02, Dimitry Andric wrote: > 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. >> >> 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. It may be useful to block these commits using a pre-commit hook? -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams