Date: Thu, 23 Jul 2009 20:03:38 +0100 From: Bruce Simpson <bms@incunabulum.net> To: John Baldwin <jhb@freebsd.org> Cc: svn-src-stable-7@freebsd.org, Brian Somers <brian@freebsd.org>, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Bruce M Simpson <bms@freebsd.org> Subject: Re: svn commit: r195829 - stable/7/sys/dev/usb Message-ID: <4A68B40A.8020307@incunabulum.net> In-Reply-To: <200907231023.47428.jhb@freebsd.org> References: <200907230135.n6N1ZEar057595@svn.freebsd.org> <20090723024640.6f5c893a@dev.lan.Awfulhak.org> <4A685A4B.9070201@incunabulum.net> <200907231023.47428.jhb@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
John Baldwin wrote: > ... > 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. > I read them, having been pointed at them by kib@ -- but they didn't explain why contrib/pf was being touched at all. In the absence of other information, I'll take this at face value, and commit the mergeinfo, although I would be happier understanding why contrib/pf is being touched by the merge. Perhaps a purchase of the Subversion book is in my future. thanks, BMS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A68B40A.8020307>