Date: Tue, 23 Mar 2010 09:55:28 -0400 From: John Baldwin <jhb@freebsd.org> To: Luigi Rizzo <rizzo@iet.unipi.it> Cc: svn-src-stable@freebsd.org, Luigi Rizzo <luigi@freebsd.org>, 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... Message-ID: <201003230955.28154.jhb@freebsd.org> In-Reply-To: <20100323101527.GA11809@onelab2.iet.unipi.it> References: <201003230958.o2N9wxoL037254@svn.freebsd.org> <20100323101527.GA11809@onelab2.iet.unipi.it>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003230955.28154.jhb>