From owner-svn-src-stable-8@FreeBSD.ORG Tue Mar 23 14:27:56 2010 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C8B7D106566B; Tue, 23 Mar 2010 14:27:56 +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 985F48FC1B; Tue, 23 Mar 2010 14:27:56 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 527E146B8A; Tue, 23 Mar 2010 10:27:56 -0400 (EDT) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPA id 8A7F68A021; Tue, 23 Mar 2010 10:27:55 -0400 (EDT) From: John Baldwin To: Luigi Rizzo Date: Tue, 23 Mar 2010 09:55:28 -0400 User-Agent: KMail/1.12.1 (FreeBSD/7.3-CBSD-20100217; KDE/4.3.1; amd64; ; ) References: <201003230958.o2N9wxoL037254@svn.freebsd.org> <20100323101527.GA11809@onelab2.iet.unipi.it> In-Reply-To: <20100323101527.GA11809@onelab2.iet.unipi.it> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201003230955.28154.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Tue, 23 Mar 2010 10:27:55 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.7 required=4.2 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: svn-src-stable@freebsd.org, Luigi Rizzo , src-committers@freebsd.org, svn-src-stable-8@freebsd.org, svn-src-all@freebsd.org Subject: Re: svn commit: r205511 - in stable/8: . contrib/top lib lib/libusb sbin/ipfw sys/conf sys/net sys/netgraph sys/netinet sys/netinet/ipfw sys/netinet/ipfw/test tools/regression/lib/msun tools/regression... X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Mar 2010 14:27:56 -0000 On Tuesday 23 March 2010 6:15:27 am Luigi Rizzo wrote: > On Tue, Mar 23, 2010 at 09:58:59AM +0000, Luigi Rizzo wrote: > ... > > > Directory Properties: > > stable/8/ (props changed) > > stable/8/Makefile.inc1 (props changed) > > stable/8/ObsoleteFiles.inc (props changed) > ... > > stable/8/usr.sbin/wpa/ (props changed) > > stable/8/usr.sbin/ypserv/ (props changed) > > stable/8/usr.sbin/zic/ (props changed) > > hmmm... all these "props changed" must be a side effect of > svn merge -r X:Y svn+ssh://...users/luigi/ipfw3-r8 > but there were no actual changes that i know of. Does anyone know > why they came out and how to prevent such things in the future ? Yes, don't merge to stable/8 directory. Instead, merge to subdirectories as the directions on the wiki say. In this case you would have done two merges, one to stable/8/sys and one to stable/8/sbin/ipfw. You could still commit it all at once with a single svn ci. -- John Baldwin