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...
Luigi Rizzo
rizzo at iet.unipi.it
Tue Mar 23 15:01:28 UTC 2010
On Tue, Mar 23, 2010 at 09:55:28AM -0400, John Baldwin wrote:
> 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
ah, ok. sorry for the confusion
cheers
luigi
More information about the svn-src-all
mailing list