From owner-svn-src-stable@FreeBSD.ORG Thu Jul 23 17:52:25 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 6B6971065673; Thu, 23 Jul 2009 17:52:25 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 393228FC0A; Thu, 23 Jul 2009 17:52:25 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id DEE7746B90; Thu, 23 Jul 2009 13:52:24 -0400 (EDT) Received: from jhbbsd.hudson-trading.com (unknown [209.249.190.8]) by bigwig.baldwin.cx (Postfix) with ESMTPA id 42B878A0A2; Thu, 23 Jul 2009 13:52:24 -0400 (EDT) From: John Baldwin To: Bruce Simpson Date: Thu, 23 Jul 2009 10:23:46 -0400 User-Agent: KMail/1.9.7 References: <200907230135.n6N1ZEar057595@svn.freebsd.org> <20090723024640.6f5c893a@dev.lan.Awfulhak.org> <4A685A4B.9070201@incunabulum.net> In-Reply-To: <4A685A4B.9070201@incunabulum.net> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200907231023.47428.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Thu, 23 Jul 2009 13:52:24 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.5 required=4.2 tests=AWL,BAYES_00, DATE_IN_PAST_03_06,RDNS_NONE autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx 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-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 17:52:26 -0000 On Thursday 23 July 2009 8:40:43 am Bruce Simpson wrote: > 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. This is a FAQ at this point and has been discussed multiple times in the archives, but it is correct. > 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. 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. -- John Baldwin