From owner-svn-src-all@FreeBSD.ORG Thu Jul 23 19:03:41 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6F351106564A; Thu, 23 Jul 2009 19:03:41 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from out1.smtp.messagingengine.com (out1.smtp.messagingengine.com [66.111.4.25]) by mx1.freebsd.org (Postfix) with ESMTP id 377A38FC17; Thu, 23 Jul 2009 19:03:41 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from compute2.internal (compute2.internal [10.202.2.42]) by out1.messagingengine.com (Postfix) with ESMTP id C6FA43BD547; Thu, 23 Jul 2009 15:03:40 -0400 (EDT) Received: from heartbeat2.messagingengine.com ([10.202.2.161]) by compute2.internal (MEProxy); Thu, 23 Jul 2009 15:03:40 -0400 X-Sasl-enc: QhsCuvlcv2cM3NgmoLqs+yFR72ReIt0VgVcCLR/mS2vc 1248375820 Received: from [192.168.123.18] (82-35-112-254.cable.ubr07.dals.blueyonder.co.uk [82.35.112.254]) by mail.messagingengine.com (Postfix) with ESMTPSA id AB9BCB624; Thu, 23 Jul 2009 15:03:39 -0400 (EDT) Message-ID: <4A68B40A.8020307@incunabulum.net> Date: Thu, 23 Jul 2009 20:03:38 +0100 From: Bruce Simpson User-Agent: Thunderbird 2.0.0.22 (Windows/20090605) MIME-Version: 1.0 To: John Baldwin References: <200907230135.n6N1ZEar057595@svn.freebsd.org> <20090723024640.6f5c893a@dev.lan.Awfulhak.org> <4A685A4B.9070201@incunabulum.net> <200907231023.47428.jhb@freebsd.org> In-Reply-To: <200907231023.47428.jhb@freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-stable-7@freebsd.org, Brian Somers , svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Bruce M Simpson Subject: Re: svn commit: r195829 - stable/7/sys/dev/usb X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Thu, 23 Jul 2009 19:03:42 -0000 John Baldwin wrote: > ... > That's because you merged to the file rather than to sys/. There's a set of > instructions about mergning with SVN on the wiki that explains why to do > kernel merges to sys/ instead of individual files. > I read them, having been pointed at them by kib@ -- but they didn't explain why contrib/pf was being touched at all. In the absence of other information, I'll take this at face value, and commit the mergeinfo, although I would be happier understanding why contrib/pf is being touched by the merge. Perhaps a purchase of the Subversion book is in my future. thanks, BMS