From owner-svn-src-stable@FreeBSD.ORG Thu Jul 23 12:40:47 2009 Return-Path: Delivered-To: svn-src-stable@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 185E6106566B; Thu, 23 Jul 2009 12:40:47 +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 D85E08FC0A; Thu, 23 Jul 2009 12:40:46 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from compute1.internal (compute1.internal [10.202.2.41]) by out1.messagingengine.com (Postfix) with ESMTP id 3847F3BCF60; Thu, 23 Jul 2009 08:40:46 -0400 (EDT) Received: from heartbeat2.messagingengine.com ([10.202.2.161]) by compute1.internal (MEProxy); Thu, 23 Jul 2009 08:40:46 -0400 X-Sasl-enc: 9esvlyEtqfKMpY46ULzKVnaQxQKzCxGLPiDOvF/buv3l 1248352845 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 2E926B4A5; Thu, 23 Jul 2009 08:40:45 -0400 (EDT) Message-ID: <4A685A4B.9070201@incunabulum.net> Date: Thu, 23 Jul 2009 13:40:43 +0100 From: Bruce Simpson User-Agent: Thunderbird 2.0.0.22 (Windows/20090605) MIME-Version: 1.0 To: Brian Somers References: <200907230135.n6N1ZEar057595@svn.freebsd.org> <4A67BFB1.40904@incunabulum.net> <20090723024640.6f5c893a@dev.lan.Awfulhak.org> In-Reply-To: <20090723024640.6f5c893a@dev.lan.Awfulhak.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, Bruce M Simpson , svn-src-stable-7@FreeBSD.org Subject: Re: svn commit: r195829 - stable/7/sys/dev/usb X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 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: Thu, 23 Jul 2009 12:40:47 -0000 Brian Somers wrote: > ... > brian@dev sys $ svn st > M . > M contrib/pf > > You should keep the mergeinfo on the sys directory, so the entire merge > should really have been done as with the above command but without > the --record-only - that would update the mergeinfo properties (as above) > and patch uipaq.c in one commit. > Why would this commit update contrib/pf? This looks spurious. I got a lot more revisions than this (especially ones listed well after the new USB merge) in the mergeinfo output, therefore I did not commit the mergeinfo update. Too many to list here ATM. thanks, BMS